User: mnf999 Date: 02/03/07 10:27:40 Modified: src/main/org/jboss/ejb Container.java Log: Took care of the FIXMEs and removed the marshalling silent failover since we do have unified class loading now. Revision Changes Path 1.80 +3 -63 jboss/src/main/org/jboss/ejb/Container.java Index: Container.java =================================================================== RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/ejb/Container.java,v retrieving revision 1.79 retrieving revision 1.80 diff -u -r1.79 -r1.80 --- Container.java 22 Feb 2002 22:54:24 -0000 1.79 +++ Container.java 7 Mar 2002 18:27:40 -0000 1.80 @@ -82,7 +82,7 @@ * @author <a href="mailto:[EMAIL PROTECTED]";>Scott Stark</a>. * @author <a href="[EMAIL PROTECTED]">Bill Burke</a> * @author <a href="mailto:[EMAIL PROTECTED]";>David Jencks</a> -* @version $Revision: 1.79 $ +* @version $Revision: 1.80 $ ** <p><b>Revisions:</b> * * <p><b>2001/07/26 bill burke:</b> @@ -632,37 +632,8 @@ { ((MarshalledInvocation) mi).setMethodMap(marshalledInvocationMapping); - // FIXME FIXME FIXME FIXME REMOVE WHEN CL ARE INTEGRATED if( trace ) - log.trace("METHOD REMOTE INVOKE "+mi.getContainer()+"||"+mi.getMethod().getName()+"||"); - } - // FIXME FIXME FIXME FIXME REMOVE WHEN CL ARE INTEGRATED - else if (!mi.getMethod().getDeclaringClass().isAssignableFrom(remoteInterface)) - { - if( trace ) - { - // FIXME FIXME FIXME FIXME REMOVE WHEN CL ARE INTEGRATED - log.trace("METHOD REMOTE INVOKE "+mi.getContainer()+"||"+mi.getMethod().getName()+"||"); - log.trace("WARNING: YOU ARE RUNNING NON-OPTIMIZED"); - } - - // TEMP FIXME HACK This makes user transactions on the server work until - // local invocations stop going through Marshalled Invocation - Transaction hack = mi.getTransaction(); - - // FIXME FIXME FIXME FIXME REMOVE WHEN CL ARE INTEGRATED - //Serialize deserialize - mi = (Invocation) new MarshalledObject(new MarshalledInvocation(mi.payload)).get(); - - // TEMP FIXME HACK This makes user transactions on the server work until - // local invocations stop going through Marshalled Invocation - mi.setTransaction(hack); - - // FIXME FIXME FIXME FIXME REMOVE WHEN CL ARE INTEGRATED - ((MarshalledInvocation) mi).setMethodMap(marshalledInvocationMapping); - - // FIXME FIXME FIXME FIXME REMOVE WHEN CL ARE INTEGRATED - return new MarshalledObject(invoke(mi)); + log.trace("METHOD REMOTE INVOKE "+mi.getObjectName()+"||"+mi.getMethod().getName()+"||"); } value= invoke(mi); @@ -681,39 +652,8 @@ ((MarshalledInvocation) mi).setMethodMap(marshalledInvocationMapping); - // FIXME FIXME FIXME FIXME REMOVE WHEN CL ARE INTEGRATED if( trace ) - log.trace("METHOD HOME INVOKE "+mi.getContainer()+"||"+mi.getMethod().getName()+"||"+mi.getArguments().toString()); - - } - // FIXME FIXME FIXME FIXME REMOVE WHEN CL ARE INTEGRATED - else if (!mi.getMethod().getDeclaringClass().isAssignableFrom(remoteInterface)) - { - - if( trace ) - { - // FIXME FIXME FIXME FIXME REMOVE WHEN CL ARE INTEGRATED - log.trace("METHOD HOME INVOKE "+mi.getContainer()+"||"+mi.getMethod().getName()+"||"+mi.getArguments().toString()); - log.trace("WARNING: YOU ARE RUNNING NON-OPTIMIZED"); - } - - // TEMP FIXME HACK This makes user transactions on the server work until - // local invocations stop going through Marshalled Invocation - Transaction hack = mi.getTransaction(); - - // FIXME FIXME FIXME FIXME REMOVE WHEN CL ARE INTEGRATED - //Serialize deserialize - mi = (MarshalledInvocation) new MarshalledObject(new MarshalledInvocation(mi.payload)).get(); - - // TEMP FIXME HACK This makes user transactions on the server work until - // local invocations stop going through Marshalled Invocation - mi.setTransaction(hack); - - // FIXME FIXME FIXME FIXME REMOVE WHEN CL ARE INTEGRATED - ((MarshalledInvocation) mi).setMethodMap(marshalledInvocationMapping); - - // FIXME FIXME FIXME FIXME REMOVE WHEN CL ARE INTEGRATED - return new MarshalledObject(invokeHome(mi)); + log.trace("METHOD HOME INVOKE "+mi.getObjectName()+"||"+mi.getMethod().getName()+"||"+mi.getArguments().toString()); }
_______________________________________________ Jboss-development mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/jboss-development
