svn commit: r709180 - in /tuscany/branches/sca-java-1.3.3/modules/core: ./ src/main/java/org/apache/tuscany/sca/core/invocation/JDKProxyFactory.java src/main/java/org/apache/tuscany/sca/core/invocation/SCAProxy.java

[antelder]

Author: antelder
Date: Thu Oct 30 08:06:02 2008
New Revision: 709180

URL: http://svn.apache.org/viewvc?rev=709180&view=rev
Log:
Merge fix from trunk to 1.3.3 branch for TUSCANY-2635: Pool stateless-scoped 
Java impl instances

Added:
    
tuscany/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/SCAProxy.java
      - copied unchanged from r709171, 
tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/SCAProxy.java
Modified:
    tuscany/branches/sca-java-1.3.3/modules/core/   (props changed)
    
tuscany/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKProxyFactory.java

Propchange: tuscany/branches/sca-java-1.3.3/modules/core/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Oct 30 08:06:02 2008
@@ -0,0 +1 @@
+/tuscany/java/sca/modules/core:673298,674894-674933,675006,675061,694165,695536,698102-698108,709171

Modified: 
tuscany/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKProxyFactory.java
URL: 
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKProxyFactory.java?rev=709180&r1=709179&r2=709180&view=diff
==============================================================================
--- 
tuscany/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKProxyFactory.java
 (original)
+++ 
tuscany/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKProxyFactory.java
 Thu Oct 30 08:06:02 2008
@@ -19,11 +19,12 @@
 package org.apache.tuscany.sca.core.invocation;
 
 import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Proxy;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
 import java.util.List;
+import java.util.HashMap;
 
+import org.apache.tuscany.sca.core.invocation.SCAProxy;
 import org.apache.tuscany.sca.core.context.CallableReferenceImpl;
 import org.apache.tuscany.sca.core.context.ServiceReferenceImpl;
 import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
@@ -54,7 +55,7 @@
         ServiceReference<T> serviceReference = new 
ServiceReferenceImpl(interfaze, wire, this);
         return createProxy(serviceReference);
     }
-
+    
     public <T> T createProxy(CallableReference<T> callableReference) throws 
ProxyCreationException {
         assert callableReference != null;
         final Class<T> interfaze = callableReference.getBusinessInterface();
@@ -62,10 +63,10 @@
         // Allow privileged access to class loader. Requires RuntimePermission 
in security policy.
         ClassLoader cl = AccessController.doPrivileged(new 
PrivilegedAction<ClassLoader>() {
             public ClassLoader run() {
-                return interfaze.getClassLoader();
+               return interfaze.getClassLoader();
             }
         });
-        Object proxy = Proxy.newProxyInstance(cl, new Class[] {interfaze}, 
handler);
+        Object proxy = SCAProxy.newProxyInstance(cl, new Class[] {interfaze}, 
handler);
         ((CallableReferenceImpl)callableReference).setProxy(proxy);
         return interfaze.cast(proxy);
     }
@@ -80,13 +81,13 @@
         Class<T> interfaze = callbackReference.getBusinessInterface();
         InvocationHandler handler = new 
JDKCallbackInvocationHandler(messageFactory, callbackReference);
         ClassLoader cl = interfaze.getClassLoader();
-               Object proxy = Proxy.newProxyInstance(cl, new Class[] 
{interfaze}, handler);
+               Object proxy = SCAProxy.newProxyInstance(cl, new Class[] 
{interfaze}, handler);
                callbackReference.setProxy(proxy);
         return interfaze.cast(proxy);
     }
 
     public <B, R extends CallableReference<B>> R cast(B target) throws 
IllegalArgumentException {
-        InvocationHandler handler = Proxy.getInvocationHandler(target);
+        InvocationHandler handler = SCAProxy.getInvocationHandler(target);
         if (handler instanceof JDKInvocationHandler) {
             return (R)((JDKInvocationHandler)handler).getCallableReference();
         } else {
@@ -98,6 +99,6 @@
      * @see 
org.apache.tuscany.sca.core.invocation.ProxyFactory#isProxyClass(java.lang.Class)
      */
     public boolean isProxyClass(Class<?> clazz) {
-        return Proxy.isProxyClass(clazz);
+        return SCAProxy.isProxyClass(clazz);
     }
 }