cvs commit: xml-axis/java/src/org/apache/axis/handlers LogHandler.java

[jmsnell]

jmsnell     2003/02/17 16:55:07

  Modified:    java/src/org/apache/axis/handlers LogHandler.java
  Log:
  FIX: http://nagoya.apache.org/bugzilla/show_bug.cgi?id=16646
  
  Added check to ensure that we're not prematurely closing System.out 
  when written to the console rather than to a file.
  
  Revision  Changes    Path
  1.39      +11 -2     xml-axis/java/src/org/apache/axis/handlers/LogHandler.java
  
  Index: LogHandler.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/handlers/LogHandler.java,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- LogHandler.java   11 Dec 2002 22:38:18 -0000      1.38
  +++ LogHandler.java   18 Feb 2003 00:55:07 -0000      1.39
  @@ -129,7 +129,12 @@
                      (outMsg == null ? "null" : outMsg.getSOAPPartAsString())));
               writer.println( 
"=======================================================" );
   
  -            writer.close();
  +            //START FIX: http://nagoya.apache.org/bugzilla/show_bug.cgi?id=16646
  +            if (!writeToConsole) {
  +              writer.close();
  +            }
  +            //END FIX: http://nagoya.apache.org/bugzilla/show_bug.cgi?id=16646
  +            
           } catch( Exception e ) {
               log.error( Messages.getMessage("exception00"), e );
               throw AxisFault.makeFault(e);
  @@ -160,7 +165,11 @@
               pw.println( "=====================" );
               pw.println( "= " + Messages.getMessage("fault00") );
               pw.println( "=====================" );
  -            pw.close();
  +            //START FIX: http://nagoya.apache.org/bugzilla/show_bug.cgi?id=16646
  +            if (!writeToConsole) {
  +              pw.close();
  +            }
  +            // END FIX: http://nagoya.apache.org/bugzilla/show_bug.cgi?id=16646
           } catch( Exception e ) {
               log.error(Messages.getMessage("exception00"), e );
           }