You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2009/11/10 20:42:35 UTC
svn commit: r834626 -
/tuscany/branches/sca-java-1.5.2/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeWireImpl.java
Author: rfeng
Date: Tue Nov 10 19:42:34 2009
New Revision: 834626
URL: http://svn.apache.org/viewvc?rev=834626&view=rev
Log:
Merge the fix from 1.x
Modified:
tuscany/branches/sca-java-1.5.2/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeWireImpl.java
Modified: tuscany/branches/sca-java-1.5.2/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeWireImpl.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.5.2/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeWireImpl.java?rev=834626&r1=834625&r2=834626&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.5.2/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeWireImpl.java (original)
+++ tuscany/branches/sca-java-1.5.2/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeWireImpl.java Tue Nov 10 19:42:34 2009
@@ -82,8 +82,8 @@
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 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 @@
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 {