diff options
author | rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68> | 2009-11-10 19:42:34 +0000 |
---|---|---|
committer | rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68> | 2009-11-10 19:42:34 +0000 |
commit | 39a3e278e786438a92428fe13646d09f3441d2e6 (patch) | |
tree | 5886867ee216a3b1eb8ee1dc41deb44f6eec0327 /branches | |
parent | 1258cb57e21dd789d04faf194c119e64809191c0 (diff) |
Merge the fix from 1.x
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@834626 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
-rw-r--r-- | branches/sca-java-1.5.2/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeWireImpl.java | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/branches/sca-java-1.5.2/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeWireImpl.java b/branches/sca-java-1.5.2/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeWireImpl.java index 4a90d47fa9..e31186ed35 100644 --- a/branches/sca-java-1.5.2/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeWireImpl.java +++ b/branches/sca-java-1.5.2/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeWireImpl.java @@ -82,8 +82,8 @@ public class RuntimeWireImpl implements RuntimeWire { private List<InvocationChain> chains; private InvocationChain bindingInvocationChain; // Cache - private transient final Map<Integer, InvocationChain> invocationChainMap = - new ConcurrentHashMap<Integer, InvocationChain>(); + private transient final Map<Operation, InvocationChain> invocationChainMap = + new ConcurrentHashMap<Operation, InvocationChain>(); /** @@ -135,8 +135,7 @@ public class RuntimeWireImpl implements RuntimeWire { } public InvocationChain getInvocationChain(Operation operation) { - Integer id = operation == null ? new Integer(0) : new Integer(System.identityHashCode(operation)); - InvocationChain cached = invocationChainMap.get(id); + InvocationChain cached = invocationChainMap.get(operation); if (cached == null) { for (InvocationChain chain : getInvocationChains()) { Operation op = null; @@ -148,11 +147,11 @@ public class RuntimeWireImpl implements RuntimeWire { op = chain.getTargetOperation(); } if (interfaceContractMapper.isCompatible(operation, op, op.getInterface().isRemotable())) { - invocationChainMap.put(id, chain); + invocationChainMap.put(operation, chain); return chain; } } - invocationChainMap.put(id, null); + invocationChainMap.put(operation, null); return null; } else { |