mx4j/src/tools/mx4j/tools/remote/caucho CauchoServlet.java,1.3,1.4

Simone Bordet <[email protected]> Mon, 10 Jan 2005 22:09:00 +0000
Newsgroups gmane.comp.java.mx4j.cvs
Message-ID <[email protected]>
Update of /cvsroot/mx4j/mx4j/src/tools/mx4j/tools/remote/caucho
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5819/src/tools/mx4j/tools/remote/caucho

Modified Files:
	CauchoServlet.java 
Log Message:
Cosmetics

Index: CauchoServlet.java
===================================================================
RCS file: /cvsroot/mx4j/mx4j/src/tools/mx4j/tools/remote/caucho/CauchoServlet.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CauchoServlet.java	13 Nov 2004 16:38:32 -0000	1.3
--- CauchoServlet.java	10 Jan 2005 22:08:58 -0000	1.4
***************
*** 18,21 ****
--- 18,22 ----
  import java.util.HashMap;
  import java.util.Map;
+ 
  import javax.servlet.ServletException;
  import javax.servlet.http.HttpServlet;
***************
*** 51,55 ****
     protected Method findMethod(String methodName)
     {
!       return (Method)methods.get(methodName);
     }
  
--- 52,56 ----
     protected Method findMethod(String methodName)
     {
!       return (Method) methods.get(methodName);
     }
  
***************
*** 91,96 ****
           output.writeFault(x);
           output.completeReply();
!       }
!       else
        {
           Object[] values = readArguments(input, method);
--- 92,96 ----
           output.writeFault(x);
           output.completeReply();
!       } else
        {
           Object[] values = readArguments(input, method);
***************
*** 101,106 ****
           {
              result = invoke(request.getRequestURL().toString(), getService(), method, headers, values);
!          }
!          catch (Throwable x)
           {
              output.startReply();
--- 101,105 ----
           {
              result = invoke(request.getRequestURL().toString(), getService(), method, headers, values);
!          } catch (Throwable x)
           {
              output.startReply();
***************
*** 134,150 ****
     {
        if (target == null) throw new IOException("Service is not available");
!       String connectionId = (String)headers.get(CauchoService.CONNECTION_ID_HEADER_NAME);
        CauchoService.setConnectionContext(url, connectionId);
        try
        {
           return method.invoke(target, values);
!       }
!       catch (InvocationTargetException x)
        {
           Throwable t = x.getTargetException();
!          if (t instanceof Exception) throw (Exception)t;
!          throw (Error)t;
!       }
!       finally
        {
           CauchoService.resetConnectionContext();
--- 133,147 ----
     {
        if (target == null) throw new IOException("Service is not available");
!       String connectionId = (String) headers.get(CauchoService.CONNECTION_ID_HEADER_NAME);
        CauchoService.setConnectionContext(url, connectionId);
        try
        {
           return method.invoke(target, values);
!       } catch (InvocationTargetException x)
        {
           Throwable t = x.getTargetException();
!          if (t instanceof Exception) throw (Exception) t;
!          throw (Error) t;
!       } finally
        {
           CauchoService.resetConnectionContext();



-------------------------------------------------------
The SF.Net email is sponsored by: Beat the post-holiday blues
Get a FREE limited edition SourceForge.net t-shirt from ThinkGeek.
It's fun and FREE -- well, almost....http://www.thinkgeek.com/sfshirt