| commit | 0c20db8d67d3c65d0a64c1fa087719281455db8b | [log] [tgz] |
|---|---|---|
| author | Yuta HIGUCHI <y-higuchi@onlab.us> | Tue Dec 17 23:06:36 2013 -0800 |
| committer | Yuta HIGUCHI <y-higuchi@onlab.us> | Tue Dec 17 23:06:36 2013 -0800 |
| tree | 25a2340b875d48897fa26dc56e859fa31d640870 | |
| parent | 4754e053cc578b8320c315d2f4fc6aece5b82b7e [diff] [blame] |
Fix merge miss
diff --git a/src/main/java/net/onrc/onos/ofcontroller/devicemanager/OnosDeviceManager.java b/src/main/java/net/onrc/onos/ofcontroller/devicemanager/OnosDeviceManager.java index f75a2b0..1b14875 100644 --- a/src/main/java/net/onrc/onos/ofcontroller/devicemanager/OnosDeviceManager.java +++ b/src/main/java/net/onrc/onos/ofcontroller/devicemanager/OnosDeviceManager.java
@@ -179,7 +179,7 @@ floodlightProvider = context.getServiceImpl(IFloodlightProviderService.class); deviceStorage = new DeviceStorageImpl(); - deviceStorage.init(""); + deviceStorage.init("",""); } @Override