Static methods on XidGenerator changed to non-static

Change-Id: I9d626793db7158a88eb287f3a180422271679167
Signed-off-by: Timotej Kubas <tkubas@cisco.com>
Signed-off-by: Martin Bobak <mbobak@cisco.com>

diff --git a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/device/XidGenerator.java b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/device/XidGenerator.java
index 5b9688bc002b83a3feb10e7e89d1d3e8f92bac9b..dfb9802a42402a7cb3dd22f8c0fb81fa564b2591 100644 (file)
--- a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/device/XidGenerator.java
+++ b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/device/XidGenerator.java
@@ -15,9 +15,9 @@ import java.util.concurrent.atomic.AtomicLong;
  */
 public class XidGenerator {
 
-    private static AtomicLong xid = new AtomicLong(0);
+    private AtomicLong xid = new AtomicLong(0);
 
-    public static Xid generate() {
+    public Xid generate() {
         return new Xid(xid.incrementAndGet());
     }
 }

diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/DeviceManagerImpl.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/DeviceManagerImpl.java
index 90886a723b53c17539796b19c4bd56c94d518eff..8499e95060f08650c3aeffcd9b50adaee6f3b2d3 100644 (file)
--- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/DeviceManagerImpl.java
+++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/DeviceManagerImpl.java
@@ -32,11 +32,11 @@ public class DeviceManagerImpl implements DeviceManager {
 
     private static final Logger LOG = LoggerFactory.getLogger(DeviceManagerImpl.class);
 
-    private Xid xid;
+    private XidGenerator xidGenerator = new XidGenerator();
 
     @Override
     public void deviceConnected(ConnectionContext connectionContext) {
-        xid = XidGenerator.generate();
+        Xid xid = xidGenerator.generate();
         DeviceContextImpl deviceContextImpl = new DeviceContextImpl();
 
         try {