mirror of https://github.com/OpenIdentityPlatform/OpenDJ.git

Matthew Swift
23.17.2011 3ac71c5f71cc497863c89847bd236db0760589a6
Fix issue OpenDJ-94: NullPointerException when shutting down worker threads
1 files modified
11 ■■■■ changed files
opends/src/server/org/opends/server/extensions/TraditionalWorkerThread.java 11 ●●●● patch | view | raw | blame | history
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)
      {