From 38a7cd061ea4e515c5677e17ab56019cdc895154 Mon Sep 17 00:00:00 2001
From: davidely <davidely@localhost>
Date: Sun, 02 Sep 2007 15:28:30 +0000
Subject: [PATCH] Make UpdateOperationTest do a in-core restart before running tests like the other replication tests. Fixed an NPE in ServerHandler that occurred in one run of the unit tests
---
opendj-sdk/opends/src/server/org/opends/server/replication/server/ServerHandler.java | 34 ++++++++++++++++++++++++++++++++--
1 files changed, 32 insertions(+), 2 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/server/ServerHandler.java b/opendj-sdk/opends/src/server/org/opends/server/replication/server/ServerHandler.java
index b67cade..858a498 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/server/ServerHandler.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/server/ServerHandler.java
@@ -24,6 +24,32 @@
*
* Portions Copyright 2006-2007 Sun Microsystems, Inc.
*/
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Portions Copyright 2006-2007 Sun Microsystems, Inc.
+ */
package org.opends.server.replication.server;
import org.opends.messages.MessageBuilder;
@@ -1257,8 +1283,12 @@
try
{
- writer.join(SHUTDOWN_JOIN_TIMEOUT);
- reader.join(SHUTDOWN_JOIN_TIMEOUT);
+ if (writer != null) {
+ writer.join(SHUTDOWN_JOIN_TIMEOUT);
+ }
+ if (reader != null) {
+ reader.join(SHUTDOWN_JOIN_TIMEOUT);
+ }
} catch (InterruptedException e)
{
// don't try anymore to join and return.
--
Gitblit v1.10.0