costin 01/09/13 23:00:14
Modified: src/share/org/apache/tomcat/util/depend
DependClassLoader.java
src/share/org/apache/tomcat/modules/loggers
AccessLogInterceptor.java
Log:
Preparing to go to sleep, fixing 2 typos in previous commits. Thanks Bojan for
reviewing the
commit message ( the error was in my 'simplification' of the original patch ).
Revision Changes Path
1.11 +2 -2
jakarta-tomcat/src/share/org/apache/tomcat/util/depend/DependClassLoader.java
Index: DependClassLoader.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/depend/DependClassLoader.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- DependClassLoader.java 2001/09/14 05:20:32 1.10
+++ DependClassLoader.java 2001/09/14 06:00:14 1.11
@@ -239,8 +239,8 @@
if( idx>=0 )
fileN=fileN.substring( 0, idx) ;
// Bojan Smojver <[EMAIL PROTECTED]>: remove jar:
- if( fileN.startsWith( "jar:" ))
- fileN=fileN.substring( 4 );
+ if( fileN.startsWith( "file:" ))
+ fileN=fileN.substring( 5 );
f=new File(fileN);
if( debug > 0 ) log( "Jar dep " +f + " " + f.exists() );
if( ! f.exists()) f=null;
1.6 +1 -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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AccessLogInterceptor.java 2001/09/14 04:07:46 1.5
+++ AccessLogInterceptor.java 2001/09/14 06:00:14 1.6
@@ -196,7 +196,7 @@
c = logformat.charAt(i);
switch (c) {
case 'h':
- if( reqest.remoteHost().toString() != null )
+ if( request.remoteHost().toString() != null )
fw.write(request.remoteHost().toString());
else
fw.write( "DEFAULT" );