| commit | fabb003fc4d96e4dcaf71760b404a064a66b597a | [log] [tgz] |
|---|---|---|
| author | HIGUCHI Yuta <y-higuchi@onlab.us> | Fri Jun 28 11:31:33 2013 -0700 |
| committer | HIGUCHI Yuta <y-higuchi@onlab.us> | Fri Jun 28 11:34:01 2013 -0700 |
| tree | 196235fb379b50d13d556fe3865ede3961744423 | |
| parent | 55f7f323ad20a08fb6fd95bcd31e9800dcebd022 [diff] [blame] |
Avoid NetworkGraph commit() if newSwitch() failed to create NetworkGraph vertex.
diff --git a/src/main/java/net/onrc/onos/ofcontroller/core/internal/SwitchStorageImpl.java b/src/main/java/net/onrc/onos/ofcontroller/core/internal/SwitchStorageImpl.java index 03a5e8e..126efb3 100644 --- a/src/main/java/net/onrc/onos/ofcontroller/core/internal/SwitchStorageImpl.java +++ b/src/main/java/net/onrc/onos/ofcontroller/core/internal/SwitchStorageImpl.java
@@ -72,7 +72,8 @@ log.info("SwitchStorage:addSwitch(): dpid {} ", dpid); try { - newSwitch(dpid); + ISwitchObject sw = newSwitch(dpid); + if ( sw == null ) throw new RuntimeException(); op.commit(); } catch (Exception e) { e.printStackTrace();