From: Francisco R. <rev...@us...> - 2003-05-28 21:30:15
|
User: reverbel Date: 03/05/28 14:30:13 Modified: iiop/src/main/org/jboss/proxy/ejb EjbHomeCorbaServant.java EjbObjectCorbaServant.java Log: Changed to follow the Invoker interface, whose invoke() method now returns an InvocationResponse. Revision Changes Path 1.6 +16 -9 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.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- EjbHomeCorbaServant.java 10 Mar 2003 12:07:28 -0000 1.5 +++ EjbHomeCorbaServant.java 28 May 2003 21:30:12 -0000 1.6 @@ -29,6 +29,7 @@ import org.jboss.iiop.rmi.marshal.strategy.SkeletonStrategy; import org.jboss.invocation.Invocation; import org.jboss.invocation.InvocationKey; +import org.jboss.invocation.InvocationResponse; import org.jboss.invocation.InvocationType; import org.jboss.invocation.PayloadKey; import org.jboss.invocation.iiop.ServantWithMBeanServer; @@ -42,7 +43,7 @@ * target container. * * @author <a href="mailto:rev...@im...">Francisco Reverbel</a> - * @version $Revision: 1.5 $ + * @version $Revision: 1.6 $ */ public class EjbHomeCorbaServant extends ServantWithMBeanServer @@ -195,10 +196,13 @@ "iiop", PayloadKey.AS_IS); inv.setType(InvocationType.HOME); - retVal = mbeanServer.invoke(containerName, - "", - new Object[] {inv}, - Invocation.INVOKE_SIGNATURE); + InvocationResponse invocationResponse = + (InvocationResponse) mbeanServer.invoke( + containerName, + "", + new Object[] {inv}, + Invocation.INVOKE_SIGNATURE); + retVal = invocationResponse.getResponse(); } out = (org.omg.CORBA_2_3.portable.OutputStream) handler.createReply(); @@ -261,10 +265,13 @@ "iiop", PayloadKey.AS_IS); inv.setType(InvocationType.HOME); - return mbeanServer.invoke(containerName, - "", - new Object[] {inv}, - Invocation.INVOKE_SIGNATURE); + InvocationResponse invocationResponse = + (InvocationResponse) mbeanServer.invoke( + containerName, + "", + new Object[] {inv}, + Invocation.INVOKE_SIGNATURE); + return invocationResponse.getResponse(); } catch (MBeanException e) { throw e.getTargetException(); 1.6 +16 -10 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.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- EjbObjectCorbaServant.java 10 Mar 2003 12:07:29 -0000 1.5 +++ EjbObjectCorbaServant.java 28 May 2003 21:30:12 -0000 1.6 @@ -30,6 +30,7 @@ import org.jboss.iiop.rmi.marshal.strategy.SkeletonStrategy; import org.jboss.invocation.Invocation; import org.jboss.invocation.InvocationKey; +import org.jboss.invocation.InvocationResponse; import org.jboss.invocation.InvocationType; import org.jboss.invocation.PayloadKey; import org.jboss.invocation.iiop.ReferenceData; @@ -45,7 +46,7 @@ * container. * * @author <a href="mailto:rev...@im...">Francisco Reverbel</a> - * @version $Revision: 1.5 $ + * @version $Revision: 1.6 $ */ public class EjbObjectCorbaServant extends ServantWithMBeanServer @@ -210,11 +211,13 @@ "iiop", PayloadKey.AS_IS); inv.setType(InvocationType.REMOTE); - retVal = mbeanServer.invoke(containerName, - "", - new Object[] {inv}, - Invocation.INVOKE_SIGNATURE); - + InvocationResponse invocationResponse = + (InvocationResponse) mbeanServer.invoke( + containerName, + "", + new Object[] {inv}, + Invocation.INVOKE_SIGNATURE); + retVal = invocationResponse.getResponse(); } out = (org.omg.CORBA_2_3.portable.OutputStream) handler.createReply(); @@ -291,10 +294,13 @@ "iiop", PayloadKey.AS_IS); inv.setType(InvocationType.REMOTE); - return mbeanServer.invoke(containerName, - "", - new Object[] {inv}, - Invocation.INVOKE_SIGNATURE); + InvocationResponse invocationResponse = + (InvocationResponse) mbeanServer.invoke( + containerName, + "", + new Object[] {inv}, + Invocation.INVOKE_SIGNATURE); + return invocationResponse.getResponse(); } catch (MBeanException e) { throw e.getTargetException(); |