geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject cvs commit: incubator-geronimo/modules/remoting/src/java/org/apache/geronimo/remoting DeMarshalingInterceptor.java
Date Sun, 15 Feb 2004 18:23:28 GMT
adc         2004/02/15 10:23:28

  Modified:    modules/remoting/src/java/org/apache/geronimo/remoting
                        DeMarshalingInterceptor.java
  Log:
  Need to check for non-normal results so that we can wrap them
  properly in a ThrowableWrapper.
  
  Revision  Changes    Path
  1.4       +9 -4      incubator-geronimo/modules/remoting/src/java/org/apache/geronimo/remoting/DeMarshalingInterceptor.java
  
  Index: DeMarshalingInterceptor.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/remoting/src/java/org/apache/geronimo/remoting/DeMarshalingInterceptor.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- DeMarshalingInterceptor.java	26 Nov 2003 20:54:28 -0000	1.3
  +++ DeMarshalingInterceptor.java	15 Feb 2004 18:23:28 -0000	1.4
  @@ -118,11 +118,16 @@
   
               try {
                   InvocationResult rc = next.invoke(marshalledInvocation);
  -                mo.set(rc.getResult());
  -                return new SimpleInvocationResult(true, mo);
  +                if (rc.isNormal()) {
  +                    mo.set(rc.getResult());
  +                    return new SimpleInvocationResult(true, mo);
  +                } else {
  +                    mo.set(new ThrowableWrapper((Throwable)rc.getResult()));
  +                    return new SimpleInvocationResult(false, mo);
  +                }
               } catch (Throwable e) {
                   mo.set(new ThrowableWrapper(e));
  -                return new SimpleInvocationResult(true, mo);
  +                return new SimpleInvocationResult(false, mo);
               }
   
           } finally {
  
  
  

Mime
View raw message