From 71da65412c1c301c7e1b700bee923289bdc60161 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Wed, 23 Mar 2011 22:17:55 +0000
Subject: [PATCH] Fix issue OpenDJ-94: NullPointerException when shutting down worker threads
---
opendj-sdk/opends/src/server/org/opends/server/extensions/TraditionalWorkerThread.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/TraditionalWorkerThread.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/TraditionalWorkerThread.java
index 174bbe4..ef84271 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/TraditionalWorkerThread.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/TraditionalWorkerThread.java
@@ -23,6 +23,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
+ * Portions copyright 2011 ForgeRock AS
*/
package org.opends.server.extensions;
import org.opends.messages.Message;
@@ -276,9 +277,13 @@
{
try
{
- CancelRequest cancelRequest =
- new CancelRequest(true, INFO_CANCELED_BY_SHUTDOWN.get());
- operation.cancel(cancelRequest);
+ final AbstractOperation localOperation = operation;
+ if (localOperation != null)
+ {
+ CancelRequest cancelRequest = new CancelRequest(true,
+ INFO_CANCELED_BY_SHUTDOWN.get());
+ localOperation.cancel(cancelRequest);
+ }
}
catch (Exception e)
{
--
Gitblit v1.10.0