cvs commit: avalon-logkit/src/java/org/apache/log/output ServletOutputLogTarget.java

[donaldp]

donaldp     2003/06/05 19:49:01

  Modified:    src/java/org/apache/log/output ServletOutputLogTarget.java
  Log:
  Strip terminating '\n's off servlet output
  
  Submiteted By: Anton Tagunov <[EMAIL PROTECTED]>
  
  Revision  Changes    Path
  1.13      +18 -1     
avalon-logkit/src/java/org/apache/log/output/ServletOutputLogTarget.java
  
  Index: ServletOutputLogTarget.java
  ===================================================================
  RCS file: 
/home/cvs/avalon-logkit/src/java/org/apache/log/output/ServletOutputLogTarget.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- ServletOutputLogTarget.java       7 Apr 2003 11:37:35 -0000       1.12
  +++ ServletOutputLogTarget.java       6 Jun 2003 02:49:01 -0000       1.13
  @@ -99,12 +99,29 @@
        */
       protected void write( final String message )
       {
  +        final int len = message.length();
  +        final char last = len > 0 ? message.charAt( len - 1 ) : 0;
  +        final char prev = len > 1 ? message.charAt( len - 2 ) : 0;
  +        final String trimmedMessage;
  +        if( prev == '\r' && last == '\n' )
  +        {
  +            trimmedMessage = message.substring( 0, len - 2 );
  +        }
  +        else if( last == '\n' )
  +        {
  +            trimmedMessage = message.substring( 0, len - 1 );
  +        }
  +        else
  +        {
  +            trimmedMessage = message;
  +        }
  +
           final ServletContext context = m_context;
           if( null != context )
           {
               synchronized( context )
               {
  -                context.log( message );
  +                context.log( trimmedMessage );
               }
           }
       }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]