[Bigdata-commit] SF.net SVN: bigdata:[7487] branches/BIGDATA_RELEASE_1_3_0/bigdata-jini/src/ java/com/bigdata/journal/jini/ha/AbstractServer.java

[<tho...@us...>]

Revision: 7487
          http://bigdata.svn.sourceforge.net/bigdata/?rev=7487&view=rev
Author:   thompsonbry
Date:     2013-10-28 15:23:15 +0000 (Mon, 28 Oct 2013)
Log Message:
-----------
Checking HAClient reference for possible null value in terminate().  The field is final, but it can be null if there is a problem during the constructor call that winds up calling through to terminate().

Modified Paths:
--------------
    branches/BIGDATA_RELEASE_1_3_0/bigdata-jini/src/java/com/bigdata/journal/jini/ha/AbstractServer.java

Modified: branches/BIGDATA_RELEASE_1_3_0/bigdata-jini/src/java/com/bigdata/journal/jini/ha/AbstractServer.java
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/bigdata-jini/src/java/com/bigdata/journal/jini/ha/AbstractServer.java	2013-10-28 13:22:57 UTC (rev 7486)
+++ branches/BIGDATA_RELEASE_1_3_0/bigdata-jini/src/java/com/bigdata/journal/jini/ha/AbstractServer.java	2013-10-28 15:23:15 UTC (rev 7487)
@@ -1897,9 +1897,9 @@
         if (log.isInfoEnabled())
             log.info("Terminating service management threads.");
 
-        if (haClient.isConnected())
+        if (haClient != null && haClient.isConnected()) { // Note: null reference is possible if ctor fails.
             haClient.disconnect(false/* immediateShutdown */);
-
+        }
         if (lookupDiscoveryManager != null) {
 
             try {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.