commit | a0cc551526bb1ca466a35b6cbd455d5d5d2a3569 | [log] [tgz] |
---|---|---|
author | Pankaj Berde <pankaj@onlab.us> | Thu Mar 14 20:34:03 2013 -0700 |
committer | Pankaj Berde <pankaj@onlab.us> | Thu Mar 14 20:34:03 2013 -0700 |
tree | eab9d5111018f51894e1114eef84a43d1314d874 | |
parent | 017960a5faf804210947b45d7076de24e4215a63 [diff] | |
parent | 259b60b0385d787bf21c81b53344d78e839ffe39 [diff] |
Merge branch 'master' of https://github.com/OPENNETWORKINGLAB/ONOS
diff --git a/src/main/java/net/onrc/onos/registry/controller/ZookeeperRegistry.java b/src/main/java/net/onrc/onos/registry/controller/ZookeeperRegistry.java index e727238..fe758cd 100644 --- a/src/main/java/net/onrc/onos/registry/controller/ZookeeperRegistry.java +++ b/src/main/java/net/onrc/onos/registry/controller/ZookeeperRegistry.java
@@ -281,7 +281,8 @@ String dpidStr = HexString.toHexString(dpid); - LeaderLatch latch = switches.get(dpidStr).getLatch(); + + LeaderLatch latch = (switches.get(dpidStr) != null)?switches.get(dpidStr).getLatch():null; if (latch == null){ log.warn("Tried to get controller for non-existent switch");