cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/modules/loggers AccessLogInterceptor.java

[costin]

costin      01/09/13 21:07:46

  Modified:    src/share/org/apache/tomcat/modules/loggers
                        AccessLogInterceptor.java
  Log:
  Flush and close the log, patch from Mike Schrag <[EMAIL PROTECTED]>
  Fix NPE reported by  Bojan Smojver <[EMAIL PROTECTED]>.
  
  Submitted by: Mike Schrag <[EMAIL PROTECTED]>
  
  Revision  Changes    Path
  1.5       +14 -1     
jakarta-tomcat/src/share/org/apache/tomcat/modules/loggers/AccessLogInterceptor.java
  
  Index: AccessLogInterceptor.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/loggers/AccessLogInterceptor.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- AccessLogInterceptor.java 2001/09/07 04:51:45     1.4
  +++ AccessLogInterceptor.java 2001/09/14 04:07:46     1.5
  @@ -196,7 +196,10 @@
                            c = logformat.charAt(i);
                            switch (c) {
                            case 'h':
  -                             fw.write(request.remoteHost().toString());
  +                             if( reqest.remoteHost().toString() != null )
  +                                 fw.write(request.remoteHost().toString());
  +                             else
  +                                 fw.write( "DEFAULT" );
                                break;
                            case 'l':
                                fw.write('-');
  @@ -284,5 +287,15 @@
            }
        }
        return 0;
  +    }
  +
  +    public void engineShutdown(ContextManager cm) throws TomcatException {
  +     // From: Mike Schrag <[EMAIL PROTECTED]> 
  +     try {
  +         getFileWriter().flush();
  +         getFileWriter().close();
  +     } catch (IOException e) {
  +         e.printStackTrace();
  +     }
       }
   }