You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by ss...@apache.org on 2013/11/08 18:01:11 UTC

git commit: proper ZookeeperService shutdown

Updated Branches:
  refs/heads/develop 83e42e292 -> eb9308a44


proper ZookeeperService shutdown


Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/eb9308a4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/eb9308a4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/eb9308a4

Branch: refs/heads/develop
Commit: eb9308a44720024623e8a5484f6f5dd94b2964b1
Parents: 83e42e2
Author: Sebastian Schaffert <ss...@apache.org>
Authored: Fri Nov 8 18:01:06 2013 +0100
Committer: Sebastian Schaffert <ss...@apache.org>
Committed: Fri Nov 8 18:01:06 2013 +0100

----------------------------------------------------------------------
 .../platform/zookeeper/services/ZookeeperServiceImpl.java      | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/eb9308a4/platform/marmotta-zookeeper/src/main/java/org/apache/marmotta/platform/zookeeper/services/ZookeeperServiceImpl.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-zookeeper/src/main/java/org/apache/marmotta/platform/zookeeper/services/ZookeeperServiceImpl.java b/platform/marmotta-zookeeper/src/main/java/org/apache/marmotta/platform/zookeeper/services/ZookeeperServiceImpl.java
index 4370c69..90e7101 100644
--- a/platform/marmotta-zookeeper/src/main/java/org/apache/marmotta/platform/zookeeper/services/ZookeeperServiceImpl.java
+++ b/platform/marmotta-zookeeper/src/main/java/org/apache/marmotta/platform/zookeeper/services/ZookeeperServiceImpl.java
@@ -149,8 +149,10 @@ public class ZookeeperServiceImpl implements ZookeeperService {
             nodeKeeper.shutdown();
             log.info("   ... closed");
         }
-        File nkProperties = new File(configurationService.getHome() + File.separator + "nodekeeper.properties");
-        properties.store(new FileOutputStream(nkProperties), "automatic nodekeeper state");
+        if(properties != null) {
+            File nkProperties = new File(configurationService.getHome() + File.separator + "nodekeeper.properties");
+            properties.store(new FileOutputStream(nkProperties), "automatic nodekeeper state");
+        }
     }
 
     /**