commit 43e5fa7ddedd2beecbc5263caad6d1821916cc21
author Ubuntu <ubuntu@onos1vpc.(none)> Wed Jan 23 02:00:03 2013 +0000
committer Ubuntu <ubuntu@onos1vpc.(none)> Wed Jan 23 02:00:03 2013 +0000
tree 8be7613f6ddcfb324f961fb0fc3428fc3c06a74a
parent 93e7c116c1b4ebc174f1d68533a48adeec6010c8
parent 1ccc7fe842fb291a2fcd9f42cd31e32484fedd56

Merge branch 'master' of https://github.com/OPENNETWORKINGLAB/ONOS

src/main/java/net/floodlightcontroller/core/internal/SwitchStorageImpl.java

diff --git a/src/main/java/net/floodlightcontroller/core/internal/SwitchStorageImpl.java b/src/main/java/net/floodlightcontroller/core/internal/SwitchStorageImpl.java
index 27d2a9f..1be6e44 100644
--- a/src/main/java/net/floodlightcontroller/core/internal/SwitchStorageImpl.java
+++ b/src/main/java/net/floodlightcontroller/core/internal/SwitchStorageImpl.java
@@ -127,7 +127,11 @@
                     /*
                      *  Do nothing or throw exception?
                      */
-            	log.info("SwitchStorage:addSwitch dpid:{} already exists", dpid);
+            		Vertex sw = graph.getVertices("dpid",dpid).iterator().next();
+            	
+            		log.info("SwitchStorage:addSwitch dpid:{} already exists", dpid);
+            		sw.setProperty("state",SwitchState.ACTIVE.toString());
+            		graph.stopTransaction(Conclusion.SUCCESS);
             } else {
                     Vertex sw = graph.addVertex(null);