commit 0cb6fe655750dab9f3a4114608d5fc783917d155
author Sho SHIMIZU <sshimizu@us.fujitsu.com> Mon Feb 23 16:39:57 2015 -0800
committer Gerrit Code Review <gerrit@onlab.us> Tue Feb 24 19:27:57 2015 +0000
tree 58544564dd51d059c0c59370d719761a4bbaaff8
parent b413be88c1e56973aacb8c4df3629f715146e902

Remove reference to a field of IntentManager from IntentWorker

Change-Id: I094c4019fbe8af342e2dae2a1c5ad780728cf27a

core/net/src/main/java/org/onosproject/net/intent/impl/IntentManager.java

diff --git a/core/net/src/main/java/org/onosproject/net/intent/impl/IntentManager.java b/core/net/src/main/java/org/onosproject/net/intent/impl/IntentManager.java
index 8f808e4..50e86bd 100644
--- a/core/net/src/main/java/org/onosproject/net/intent/impl/IntentManager.java
+++ b/core/net/src/main/java/org/onosproject/net/intent/impl/IntentManager.java
@@ -285,7 +285,8 @@
     }
 
     private Future<FinalIntentProcessPhase> submitIntentData(IntentData data) {
-        return workerExecutor.submit(new IntentWorker(data));
+        IntentData current = store.getIntentData(data.key());
+        return workerExecutor.submit(new IntentWorker(data, current));
     }
 
     private class IntentBatchPreprocess implements Runnable {
@@ -366,14 +367,16 @@
     private final class IntentWorker implements Callable<FinalIntentProcessPhase> {
 
         private final IntentData data;
+        private final IntentData current;
 
-        private IntentWorker(IntentData data) {
-            this.data = data;
+        private IntentWorker(IntentData data, IntentData current) {
+            this.data = checkNotNull(data);
+            this.current = current;
         }
 
         @Override
         public FinalIntentProcessPhase call() throws Exception {
-            IntentProcessPhase update = createIntentUpdate(data);
+            IntentProcessPhase update = createIntentUpdate();
             Optional<IntentProcessPhase> currentPhase = Optional.of(update);
             IntentProcessPhase previousPhase = update;
 
@@ -384,20 +387,19 @@
             return (FinalIntentProcessPhase) previousPhase;
         }
 
-        private IntentProcessPhase createIntentUpdate(IntentData intentData) {
-            IntentData current = store.getIntentData(intentData.key());
-            switch (intentData.state()) {
+        private IntentProcessPhase createIntentUpdate() {
+            switch (data.state()) {
                 case INSTALL_REQ:
-                    return new InstallRequest(processor, intentData, Optional.ofNullable(current));
+                    return new InstallRequest(processor, data, Optional.ofNullable(current));
                 case WITHDRAW_REQ:
                     if (current == null || isNullOrEmpty(current.installables())) {
-                        return new Withdrawn(intentData, WITHDRAWN);
+                        return new Withdrawn(data, WITHDRAWN);
                     } else {
-                        return new WithdrawRequest(processor, intentData, current);
+                        return new WithdrawRequest(processor, data, current);
                     }
                 default:
                     // illegal state
-                    return new CompilingFailed(intentData);
+                    return new CompilingFailed(data);
             }
         }
     }