accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From md...@apache.org
Subject [1/6] git commit: ACCUMULO-2864 add nullcheck in ZooSession.shutdown
Date Thu, 05 Jun 2014 22:12:15 GMT
Repository: accumulo
Updated Branches:
  refs/heads/1.5.2-SNAPSHOT 9fcca2ede -> affb9743a
  refs/heads/1.6.1-SNAPSHOT c2025989f -> 18d6ca1bf
  refs/heads/master e106fe07b -> 809b73c05


ACCUMULO-2864 add nullcheck in ZooSession.shutdown


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

Branch: refs/heads/1.5.2-SNAPSHOT
Commit: affb9743a3297ff6a147ab23bba44b5c5c045420
Parents: 9fcca2e
Author: Mike Drob <mdrob@cloudera.com>
Authored: Thu Jun 5 15:11:12 2014 -0700
Committer: Mike Drob <mdrob@cloudera.com>
Committed: Thu Jun 5 15:11:12 2014 -0700

----------------------------------------------------------------------
 .../main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java  | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/affb9743/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
----------------------------------------------------------------------
diff --git a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
index de9729a..205ff01 100644
--- a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
+++ b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
@@ -152,6 +152,9 @@ public class ZooSession {
   }
 
   public static synchronized void shutdown() {
+    if (sessions == null)
+      return;
+
     for (ZooSessionInfo zsi : sessions.values()) {
       try {
         zsi.zooKeeper.close();


Mime
View raw message