From 69f39165afd0d36b6181db550bb54ad03963150f Mon Sep 17 00:00:00 2001
From: gbellato <gbellato@localhost>
Date: Thu, 05 Jul 2007 08:36:58 +0000
Subject: [PATCH] Fix for issue 1879 : null pointer Exception when running on a machine with badly configure named resolution.
---
opendj-sdk/opends/src/server/org/opends/server/replication/plugin/ReplicationBroker.java | 5 ++++-
opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationServer.java | 16 +++++++++-------
2 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/ReplicationBroker.java b/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/ReplicationBroker.java
index c1fdbb6..d87ef2e 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/ReplicationBroker.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/ReplicationBroker.java
@@ -727,7 +727,10 @@
public void setSoTimeout(int timeout) throws SocketException
{
this.timeout = timeout;
- session.setSoTimeout(timeout);
+ if (session != null)
+ {
+ session.setSoTimeout(timeout);
+ }
}
/**
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationServer.java b/opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationServer.java
index 04185d9..b4bf0cf 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationServer.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationServer.java
@@ -424,19 +424,18 @@
shutdown = true;
// shutdown the connect thread
- try
+ if (myConnectThread != null)
{
myConnectThread.interrupt();
- } catch (NullPointerException e)
- {
- // FIXME To be investigated the conditions
- // where myConnectThread can be null here
}
// shutdown the listener thread
try
{
- listenSocket.close();
+ if (listenSocket != null)
+ {
+ listenSocket.close();
+ }
} catch (IOException e)
{
// replication Server service is closing anyway.
@@ -448,7 +447,10 @@
replicationCache.shutdown();
}
- dbEnv.shutdown();
+ if (dbEnv != null)
+ {
+ dbEnv.shutdown();
+ }
DirectoryServer.deregisterMonitorProvider(getMonitorInstanceName());
}
--
Gitblit v1.10.0