axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ru...@apache.org
Subject cvs commit: xml-axis/java/src/org/apache/axis/handlers/tcp TCPActionHandler.java
Date Wed, 13 Jun 2001 11:37:26 GMT
rubys       01/06/13 04:37:25

  Modified:    java/src/org/apache/axis/handlers/http
                        HTTPActionHandler.java JWSHandler.java
                        URLMapper.java
               java/src/org/apache/axis/handlers/tcp TCPActionHandler.java
  Log:
  Search for a service handler should continue until a match on a deployed
  service is found - i.e., it is not an error for an individual handler to
  not find a match, and the search should continue until a match is found
  (not merely a service registry lookup)
  
  Revision  Changes    Path
  1.3       +2 -3      xml-axis/java/src/org/apache/axis/handlers/http/HTTPActionHandler.java
  
  Index: HTTPActionHandler.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/handlers/http/HTTPActionHandler.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- HTTPActionHandler.java	2001/04/30 18:39:32	1.2
  +++ HTTPActionHandler.java	2001/06/13 11:37:22	1.3
  @@ -79,10 +79,9 @@
       {
           Debug.Print( 1, "Enter: HTTPActionHandler::invoke" );
   
  -        /** If there's already a targetService (ie. JWSProcessor) then
  -         *  just return.
  +        /** If there's already a targetService then just return.
            */
  -        if ( msgContext.getTargetService() == null ) {
  +        if ( msgContext.getServiceHandler() == null ) {
               String action = (String) msgContext.getProperty(
                                                 HTTPConstants.MC_HTTP_SOAPACTION);
               Debug.Print( 2, "  HTTP SOAPAction: " + action );
  
  
  
  1.3       +1 -1      xml-axis/java/src/org/apache/axis/handlers/http/JWSHandler.java
  
  Index: JWSHandler.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/handlers/http/JWSHandler.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- JWSHandler.java	2001/04/30 18:39:33	1.2
  +++ JWSHandler.java	2001/06/13 11:37:22	1.3
  @@ -76,7 +76,7 @@
   
           /** If there's already a targetService just return.
            */
  -        if ( msgContext.getTargetService() == null ) {
  +        if ( msgContext.getServiceHandler() == null ) {
               HttpServlet        servlet = (HttpServlet) msgContext.getProperty(
                                                  HTTPConstants.MC_HTTP_SERVLET);
               ServletConfig      config  = servlet.getServletConfig();
  
  
  
  1.2       +2 -3      xml-axis/java/src/org/apache/axis/handlers/http/URLMapper.java
  
  Index: URLMapper.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/handlers/http/URLMapper.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- URLMapper.java	2001/05/22 05:25:34	1.1
  +++ URLMapper.java	2001/06/13 11:37:22	1.2
  @@ -72,10 +72,9 @@
       {
           Debug.Print( 1, "Enter: URLMapper::invoke" );
   
  -        /** If there's already a targetService (ie. JWSProcessor) then
  -         *  just return.
  +        /** If there's already a targetService then just return.
            */
  -        if ( msgContext.getTargetService() == null ) {
  +        if ( msgContext.getServiceHandler() == null ) {
               HttpServletRequest req = (HttpServletRequest) msgContext.getProperty(
                                                 HTTPConstants.MC_HTTP_SERVLETREQUEST);
               
  
  
  
  1.4       +6 -10     xml-axis/java/src/org/apache/axis/handlers/tcp/TCPActionHandler.java
  
  Index: TCPActionHandler.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/handlers/tcp/TCPActionHandler.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- TCPActionHandler.java	2001/06/12 15:43:13	1.3
  +++ TCPActionHandler.java	2001/06/13 11:37:24	1.4
  @@ -83,10 +83,9 @@
     {
       Debug.Print( 1, "Enter: TCPActionHandler::invoke" );
       
  -    /** If there's already a targetService (ie. JWSProcessor) then
  -     *  just return.
  +    /** If there's already a targetService then just return.
        */
  -    if ( msgContext.getTargetService() == null ) {
  +    if ( msgContext.getServiceHandler() == null ) {
         
         String targetServiceName = null;
   
  @@ -146,16 +145,13 @@
             }
           }
           
  -        if (targetServiceName == null) {
  -          // couldn't find service with that method name, fault
  -          throw new AxisFault("Server.NoServiceForMethod", "Could not find service with
method name "+mName, null, null);
  +        // if we found a target service, set it!
  +        if (targetServiceName != null) {
  +          msgContext.setTargetService( targetServiceName );
  +          Debug.Print( 2, "  First method name: " + mName );
           }
  -        
  -        Debug.Print( 2, "  First method name: " + mName );
  -        
         }
         
  -      msgContext.setTargetService( targetServiceName );
       }
       
       // Just for kicks, try getting the message back as String, to cure
  
  
  

Mime
View raw message