svn commit: r1038187 - in /ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine: IMAManager.java IMAManager2.java

[va...@apache.org]

Author: vanto
Date: Tue Nov 23 16:15:46 2010
New Revision: 1038187

URL: http://svn.apache.org/viewvc?rev=1038187&view=rev
Log:
fixing a migration issue, adding a missing hashCode + equals impl.

Modified:
    ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/IMAManager.java
    ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/IMAManager2.java

Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/IMAManager.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/IMAManager.java?rev=1038187&r1=1038186&r2=1038187&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/IMAManager.java (original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/IMAManager.java Tue Nov 23 16:15:46 2010
@@ -221,20 +221,12 @@ public class IMAManager implements Seria
     public IMAManager2 toIMAManager2() {
         IMAManager2 newIMA = new IMAManager2();
         for (String channel : _byChannel.keySet()) {
-            IMAManager2.Entry entry = new IMAManager2.Entry(_byChannel.get(channel).pickResponseChannel, _byChannel.get(channel).selectors);
-            newIMA._byChannel.put(channel, entry);
+            newIMA.register(channel, _byChannel.get(channel).selectors);
         }
         for (OutstandingRequestIdTuple orid : _byOrid.keySet()) {
             IMAManager2.OutstandingRequestIdTuple newOrid = new IMAManager2.OutstandingRequestIdTuple(orid.partnerLink, orid.opName, orid.mexId);
             newIMA._byOrid.put(newOrid, _byOrid.get(orid));
         }
-        for (RequestIdTuple rid : _byRid.keySet()) {
-            IMAManager2.Entry entry = new IMAManager2.Entry(_byRid.get(rid).pickResponseChannel, _byRid.get(rid).selectors);
-            for (Selector sel : entry.selectors) {
-                IMAManager2.RequestIdTuple newRid = new IMAManager2.RequestIdTuple(rid.partnerLink, rid.opName, sel.correlationKeySet);
-                newIMA._byRid.put(newRid, entry);
-            }
-        }
 
         return newIMA;
     }

Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/IMAManager2.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/IMAManager2.java?rev=1038187&r1=1038186&r2=1038187&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/IMAManager2.java (original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/IMAManager2.java Tue Nov 23 16:15:46 2010
@@ -20,6 +20,7 @@ package org.apache.ode.bpel.engine;
 
 import java.io.Serializable;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
@@ -310,6 +311,37 @@ public class IMAManager2 implements Seri
             this.selectors = selectors;
         }
 
+        @Override
+        public int hashCode() {
+            final int prime = 31;
+            int result = 1;
+            result = prime
+                    * result
+                    + ((pickResponseChannel == null) ? 0 : pickResponseChannel
+                            .hashCode());
+            result = prime * result + Arrays.hashCode(selectors);
+            return result;
+        }
+
+        @Override
+        public boolean equals(Object obj) {
+            if (this == obj)
+                return true;
+            if (obj == null)
+                return false;
+            if (getClass() != obj.getClass())
+                return false;
+            Entry other = (Entry) obj;
+            if (pickResponseChannel == null) {
+                if (other.pickResponseChannel != null)
+                    return false;
+            } else if (!pickResponseChannel.equals(other.pickResponseChannel))
+                return false;
+            if (!Arrays.equals(selectors, other.selectors))
+                return false;
+            return true;
+        }
+
         public String toString() {
             return ObjectPrinter.toString(this, new Object[] { "pickResponseChannel", pickResponseChannel, "selectors", selectors });
         }