From 67405dde9ba213331dab1fc46cb18c485070fd5b Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Fri, 05 Jun 2009 09:04:50 +0000
Subject: [PATCH] svn merge -r5333:5417 https://opends.dev.java.net/svn/opends/branches/b2.0
---
opends/src/server/org/opends/server/backends/task/Task.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/opends/src/server/org/opends/server/backends/task/Task.java b/opends/src/server/org/opends/server/backends/task/Task.java
index 623639e..8f66618 100644
--- a/opends/src/server/org/opends/server/backends/task/Task.java
+++ b/opends/src/server/org/opends/server/backends/task/Task.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2006-2008 Sun Microsystems, Inc.
+ * Copyright 2006-2009 Sun Microsystems, Inc.
*/
package org.opends.server.backends.task;
@@ -958,6 +958,14 @@
*/
public void addLogMessage(Message message)
{
+ // We cannot do task logging if the schema is either destroyed or
+ // not initialized eg during in-core restart from Restart task.
+ // Bailing out if there is no schema available saves us from NPE.
+ if (DirectoryServer.getSchema() == null)
+ {
+ return;
+ }
+
// We only need to grab the entry-level lock if we don't already hold the
// broader scheduler lock.
boolean needLock = (! taskScheduler.holdsSchedulerLock());
--
Gitblit v1.10.0