commit 9081c90a5998a9e09d6d9a9d8d8781252845eb77
author Brian O'Connor <bocon@onlab.us> Thu Mar 05 16:26:25 2015 -0800
committer Ray Milkey <ray@onlab.us> Fri Mar 06 17:34:44 2015 +0000
tree 2a66b1b76af4c0153b4e34af0aff4e1f7eccfa68
parent 1736749a60fd3e951dd8a989c30ce1650e8493f3

Adding origin to IntentData copy

Change-Id: Ia7c8eab72b8cbb1c5fa7a760774b8103a408d3a4

core/store/dist/src/main/java/org/onosproject/store/intent/impl/GossipIntentStore.java

diff --git a/core/store/dist/src/main/java/org/onosproject/store/intent/impl/GossipIntentStore.java b/core/store/dist/src/main/java/org/onosproject/store/intent/impl/GossipIntentStore.java
index 2bc992b..717c9fe 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/intent/impl/GossipIntentStore.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/intent/impl/GossipIntentStore.java
@@ -45,6 +45,7 @@
 import org.slf4j.Logger;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
@@ -158,6 +159,7 @@
         if (original.installables() != null) {
             result.setInstallables(original.installables());
         }
+        result.setOrigin(original.origin());
         return result;
     }
 
@@ -248,7 +250,7 @@
         }
     }
 
-    private Iterable<NodeId> getPeerNodes(Key key, IntentData data) {
+    private Collection<NodeId> getPeerNodes(Key key, IntentData data) {
         NodeId master = partitionService.getLeader(key);
         NodeId origin = (data != null) ? data.origin() : null;
         NodeId me = clusterService.getLocalNode().id();
@@ -257,7 +259,7 @@
         if (isMaster && isOrigin) {
             return ImmutableList.of(getRandomNode());
         } else if (isMaster) {
-            return ImmutableList.of(origin);
+            return origin != null ? ImmutableList.of(origin) : ImmutableList.of(getRandomNode());
         } else if (isOrigin) {
             return ImmutableList.of(master);
         } else {