You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ch...@apache.org on 2003/11/11 22:53:27 UTC
cvs commit: incubator-geronimo/modules/core/src/java/org/apache/geronimo/proxy ProxyContainer.java ReflexiveInterceptor.java
chirino 2003/11/11 13:53:27
Modified: modules/core/src/java/org/apache/geronimo/proxy
ProxyContainer.java ReflexiveInterceptor.java
Log:
- Add the originating proxy to the invocation object.
- Remove deprecated warnings.
Revision Changes Path
1.5 +2 -1 incubator-geronimo/modules/core/src/java/org/apache/geronimo/proxy/ProxyContainer.java
Index: ProxyContainer.java
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/proxy/ProxyContainer.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ProxyContainer.java 1 Oct 2003 02:30:16 -0000 1.4
+++ ProxyContainer.java 11 Nov 2003 21:53:27 -0000 1.5
@@ -81,6 +81,7 @@
Invocation invocation = new ProxyInvocation();
ProxyInvocation.putMethod(invocation, method);
ProxyInvocation.putArguments(invocation, args);
+ ProxyInvocation.putProxy(invocation, proxy);
try {
InvocationResult result = this.invoke(invocation);
return result.getResult();
1.4 +4 -4 incubator-geronimo/modules/core/src/java/org/apache/geronimo/proxy/ReflexiveInterceptor.java
Index: ReflexiveInterceptor.java
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/proxy/ReflexiveInterceptor.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ReflexiveInterceptor.java 8 Sep 2003 04:31:39 -0000 1.3
+++ ReflexiveInterceptor.java 11 Nov 2003 21:53:27 -0000 1.4
@@ -66,7 +66,7 @@
/**
* @version $Revision$ $Date$
*/
-final public class ReflexiveInterceptor extends AbstractInterceptor {
+public class ReflexiveInterceptor extends AbstractInterceptor {
Object target;
@@ -83,12 +83,12 @@
Method m = ProxyInvocation.getMethod(invocation);
Object args[] = ProxyInvocation.getArguments(invocation);
Object rc = m.invoke(target, args);
- return new SimpleInvocationResult(rc);
+ return new SimpleInvocationResult(true, rc);
} catch (InvocationTargetException e) {
Throwable t = e.getCause();
if (t instanceof Exception && t instanceof RuntimeException == false) {
- return new SimpleInvocationResult((Exception)t);
+ return new SimpleInvocationResult(false, (Exception)t);
} else {
throw t;
}