commit 723f55316577dd90a56a0a47eaa54b61349c7b6c
author Marc De Leenheer <marc@onlab.us> Wed Jun 03 20:16:17 2015 -0700
committer Gerrit Code Review <gerrit@onlab.us> Thu Jun 04 19:14:37 2015 +0000
tree 819236db85182426bde256111b1f0e27bb11c827
parent a3d67cd8a08f0d31dac24354015c2259d8802316

Allow static lambda and port mappings (ONOS-2067).
Fix bug in device resource store.

Change-Id: I219a4de9ec803b3d142a6b957868f64dc599fa24

core/store/dist/src/main/java/org/onosproject/store/resource/impl/ConsistentDeviceResourceStore.java

diff --git a/core/store/dist/src/main/java/org/onosproject/store/resource/impl/ConsistentDeviceResourceStore.java b/core/store/dist/src/main/java/org/onosproject/store/resource/impl/ConsistentDeviceResourceStore.java
index c2299ef..bc45583 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/resource/impl/ConsistentDeviceResourceStore.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/resource/impl/ConsistentDeviceResourceStore.java
@@ -165,7 +165,13 @@
 
     @Override
     public Set<IntentId> getMapping(IntentId intentId) {
-        return intentMapping.get(intentId).value();
+        Versioned<Set<IntentId>> result = intentMapping.get(intentId);
+
+        if (result == null) {
+            return result.value();
+        }
+
+        return null;
     }
 
     @Override
@@ -174,10 +180,11 @@
 
 
         if (versionedIntents == null) {
-            intentMapping.put(keyIntentId, Collections.singleton(valIntentId));
+            Set<IntentId> newSet = new HashSet<>();
+            newSet.add(valIntentId);
+            intentMapping.put(keyIntentId, newSet);
         } else {
             versionedIntents.value().add(valIntentId);
-            intentMapping.put(keyIntentId, versionedIntents.value());
         }
 
         return true;