You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by ha...@apache.org on 2005/07/01 18:11:06 UTC

cvs commit: ws-axis/c/tests/utils/monitor/org/apache/test MockServer.java StopMockServer.java

hawkeye     2005/07/01 09:11:06

  Modified:    c/tests/utils/monitor/org/apache/test MockServer.java
                        StopMockServer.java
  Log:
  mockserver and stop mockserver now cleanup a bit better.
  
  Revision  Changes    Path
  1.2       +10 -0     ws-axis/c/tests/utils/monitor/org/apache/test/MockServer.java
  
  Index: MockServer.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/tests/utils/monitor/org/apache/test/MockServer.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- MockServer.java	8 Jun 2005 15:52:06 -0000	1.1
  +++ MockServer.java	1 Jul 2005 16:11:06 -0000	1.2
  @@ -186,6 +186,16 @@
               }
           }
           while (continueToRun);
  +        // clean up
  +        try
  +        {
  +            serverSocket.close();
  +        }
  +        catch(IOException exception)
  +        {
  +            System.err.println( "MockServer#run(): IOException when closing the serverSocket: ");
  +            exception.printStackTrace(System.err);
  +        }
       }
   }
    
  \ No newline at end of file
  
  
  
  1.2       +8 -2      ws-axis/c/tests/utils/monitor/org/apache/test/StopMockServer.java
  
  Index: StopMockServer.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/tests/utils/monitor/org/apache/test/StopMockServer.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- StopMockServer.java	8 Jun 2005 15:52:06 -0000	1.1
  +++ StopMockServer.java	1 Jul 2005 16:11:06 -0000	1.2
  @@ -59,8 +59,14 @@
           {
               try
               {
  -                dos.close( );
  -                socket.close( );
  +                if(dos!=null)
  +                {
  +                    dos.close( );
  +                }
  +                if(socket!=null)
  +                {
  +                    socket.close( );
  +                }
               }
               catch (Exception exe)
               {