cvs commit: xml-axis/java/test/wsdl/extensibility ExtensibilityQueryTestCase.java

[glyn]

glyn        2002/09/20 02:42:36

  Modified:    java/src/org/apache/axis/server Tag: beta-3-patches
                        AxisServer.java
               java/test/wsdl/extensibility Tag: beta-3-patches
                        ExtensibilityQueryTestCase.java
  Log:
  Fix NPE when logging. Add diagnostics to a testcase.
  
  Note: the NPE fix was taken from HEAD. The diagnostics need not be migrated
  to HEAD as they are not essential.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.71.4.1  +3 -2      xml-axis/java/src/org/apache/axis/server/AxisServer.java
  
  Index: AxisServer.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/server/AxisServer.java,v
  retrieving revision 1.71
  retrieving revision 1.71.4.1
  diff -u -r1.71 -r1.71.4.1
  --- AxisServer.java   1 Jul 2002 17:40:36 -0000       1.71
  +++ AxisServer.java   20 Sep 2002 09:42:35 -0000      1.71.4.1
  @@ -336,8 +336,9 @@
                                   " preInvoke=" + ( t3-t2 ) +
                                   " invoke=" + ( t4-t3 ) +
                                   " postInvoke=" + ( t5-t4 ) +
  -                                msgContext.getTargetService() +
  -                                "." + msgContext.getOperation().getName());
  +                                " " + msgContext.getTargetService() + "." +
  +                                 ((msgContext.getOperation( ) == null) ?
  +                                 "" : msgContext.getOperation().getName()) );
                   }
   
               }
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.5.4.1   +4 -0      
xml-axis/java/test/wsdl/extensibility/ExtensibilityQueryTestCase.java
  
  Index: ExtensibilityQueryTestCase.java
  ===================================================================
  RCS file: 
/home/cvs/xml-axis/java/test/wsdl/extensibility/ExtensibilityQueryTestCase.java,v
  retrieving revision 1.5
  retrieving revision 1.5.4.1
  diff -u -r1.5 -r1.5.4.1
  --- ExtensibilityQueryTestCase.java   11 Jun 2002 14:54:03 -0000      1.5
  +++ ExtensibilityQueryTestCase.java   20 Sep 2002 09:42:36 -0000      1.5.4.1
  @@ -58,6 +58,10 @@
           catch (java.rmi.RemoteException re) {
               throw new junit.framework.AssertionFailedError("Remote Exception 
caught: " + re);
           }
  +        catch (Throwable ex) {
  +            ex.printStackTrace();
  +            throw new junit.framework.AssertionFailedError("Throwable caught: " + 
ex);
  +        }
       }
   
       private void isValid(QueryResultType result, String name, String value) {