Bump upstreams

[ovsdb.git] / hwvtepsouthbound / hwvtepsouthbound-impl / src / main / java / org / opendaylight / ovsdb / hwvtepsouthbound / HwvtepDeviceInfo.java

diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/HwvtepDeviceInfo.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/HwvtepDeviceInfo.java
index 078318996884fdd8857f92102ab2d5156c81cf30..b555be0747af37bbf541576562f1012882d63bbf 100644 (file)
--- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/HwvtepDeviceInfo.java
+++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/HwvtepDeviceInfo.java
@@ -131,7 +131,6 @@ public class HwvtepDeviceInfo {
         }
     }
 
-    private static AtomicInteger ZERO = new AtomicInteger(0);
     private final Map<InstanceIdentifier<?>, Set<InstanceIdentifier>> tepIdReferences = new ConcurrentHashMap<>();
     private final Map<InstanceIdentifier<LogicalSwitches>, Map<InstanceIdentifier<RemoteUcastMacs>, RemoteUcastMacs>>
             logicalSwitchVsUcasts = new ConcurrentHashMap<>();
@@ -139,19 +138,17 @@ public class HwvtepDeviceInfo {
             logicalSwitchVsMcasts = new ConcurrentHashMap<>();
     private final Map<UUID, PhysicalSwitch> physicalSwitches = new ConcurrentHashMap<>();
     private final Map<UUID, UUID> mapTunnelToPhysicalSwitch = new ConcurrentHashMap<>();
-
+    private final Map<Class<? extends KeyAware>, Map<InstanceIdentifier, DeviceData>> opKeyVsData =
+        new ConcurrentHashMap<>();
+    private final Map<Class<? extends KeyAware>, Map<UUID, DeviceData>> uuidVsData = new ConcurrentHashMap<>();
     private final HwvtepConnectionInstance connectionInstance;
+    private final DependencyQueue dependencyQueue;
 
     private Map<InstanceIdentifier, AtomicInteger> iidInQueueCount = new ConcurrentHashMap<>();
     private Map<Class<? extends KeyAware>, Map<InstanceIdentifier, DeviceData>> configKeyVsData =
             new ConcurrentHashMap<>();
-    private final Map<Class<? extends KeyAware>, Map<InstanceIdentifier, DeviceData>> opKeyVsData =
-            new ConcurrentHashMap<>();
-    private final Map<Class<? extends KeyAware>, Map<UUID, DeviceData>> uuidVsData = new ConcurrentHashMap<>();
-    private final DependencyQueue dependencyQueue;
-    private TransactionHistory controllerTxHistory;
-    private TransactionHistory deviceUpdateHistory;
-
+    private TransactionHistory controllerTxHistory = null;
+    private TransactionHistory deviceUpdateHistory = null;
 
     public HwvtepDeviceInfo(HwvtepConnectionInstance hwvtepConnectionInstance) {
         this.connectionInstance = hwvtepConnectionInstance;