[jboss-cvs] contrib/iiop/src/main/org/jboss/proxy/ejb EjbHomeCorbaServant.java EjbObjectCorbaServant.java

[Francisco R. <rev...@us...>]

  User: reverbel
  Date: 04/02/06 10:35:18

  Modified:    iiop/src/main/org/jboss/proxy/ejb EjbHomeCorbaServant.java
                        EjbObjectCorbaServant.java
  Log:
  Convert java.rmi and javax.transaction exceptions into CORBA system exceptions.
  
  Revision  Changes    Path
  1.9       +3 -1      contrib/iiop/src/main/org/jboss/proxy/ejb/EjbHomeCorbaServant.java
  
  Index: EjbHomeCorbaServant.java
  ===================================================================
  RCS file: /cvsroot/jboss/contrib/iiop/src/main/org/jboss/proxy/ejb/EjbHomeCorbaServant.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- EjbHomeCorbaServant.java	20 Jan 2004 04:20:15 -0000	1.8
  +++ EjbHomeCorbaServant.java	6 Feb 2004 18:35:18 -0000	1.9
  @@ -24,6 +24,7 @@
   import org.omg.CORBA.portable.ResponseHandler;
   import org.omg.PortableServer.POA;
   
  +import org.jboss.iiop.rmi.RmiIdlUtil;
   import org.jboss.iiop.rmi.marshal.strategy.SkeletonStrategy;
   import org.jboss.invocation.Invocation;
   import org.jboss.invocation.InvocationContext;
  @@ -42,7 +43,7 @@
    * target container. 
    *
    * @author  <a href="mailto:rev...@im...">Francisco Reverbel</a>
  - * @version $Revision: 1.8 $
  + * @version $Revision: 1.9 $
    */
   public class EjbHomeCorbaServant 
         extends ServantWithMBeanServer
  @@ -214,6 +215,7 @@
               if (e instanceof MBeanException) {
                  e = ((MBeanException)e).getTargetException();
               }
  +            RmiIdlUtil.rethrowIfCorbaSystemException(e);
               out = (org.omg.CORBA_2_3.portable.OutputStream) 
                  handler.createExceptionReply();
               op.writeException(out, e);
  
  
  
  1.9       +3 -1      contrib/iiop/src/main/org/jboss/proxy/ejb/EjbObjectCorbaServant.java
  
  Index: EjbObjectCorbaServant.java
  ===================================================================
  RCS file: /cvsroot/jboss/contrib/iiop/src/main/org/jboss/proxy/ejb/EjbObjectCorbaServant.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- EjbObjectCorbaServant.java	20 Jan 2004 04:20:16 -0000	1.8
  +++ EjbObjectCorbaServant.java	6 Feb 2004 18:35:18 -0000	1.9
  @@ -28,6 +28,7 @@
   import org.omg.PortableServer.Current;
   import org.omg.PortableServer.POA;
   
  +import org.jboss.iiop.rmi.RmiIdlUtil;
   import org.jboss.iiop.rmi.marshal.strategy.SkeletonStrategy;
   import org.jboss.invocation.Invocation;
   import org.jboss.invocation.InvocationContext;
  @@ -48,7 +49,7 @@
    * container. 
    *
    * @author  <a href="mailto:rev...@im...">Francisco Reverbel</a>
  - * @version $Revision: 1.8 $
  + * @version $Revision: 1.9 $
    */
   public class EjbObjectCorbaServant 
         extends ServantWithMBeanServer
  @@ -233,6 +234,7 @@
               if (e instanceof MBeanException) {
                  e = ((MBeanException)e).getTargetException();
               }
  +            RmiIdlUtil.rethrowIfCorbaSystemException(e);
               out = (org.omg.CORBA_2_3.portable.OutputStream) 
                     handler.createExceptionReply();
               op.writeException(out, e);