Author: markt
Date: Fri Feb 18 20:58:16 2011
New Revision: 1072145
URL: http://svn.apache.org/viewvc?rev=1072145&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48863
Better logging when specifying an invalid directory for a class loader.
Based on a patch by Ralf Hauser.
Modified:
tomcat/trunk/java/org/apache/catalina/startup/ClassLoaderFactory.java
tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/startup/ClassLoaderFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ClassLoaderFactory.java?rev=1072145&r1=1072144&r2=1072145&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/ClassLoaderFactory.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ClassLoaderFactory.java Fri
Feb 18 20:58:16 2011
@@ -30,6 +30,7 @@ import java.util.Set;
import org.apache.catalina.loader.StandardClassLoader;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
+import org.apache.tomcat.util.res.StringManager;
/**
@@ -55,6 +56,9 @@ public final class ClassLoaderFactory {
private static final Log log = LogFactory.getLog(ClassLoaderFactory.class);
+
+ private static final StringManager sm =
+ StringManager.getManager(Constants.Package);
protected static final Integer IS_DIR = Integer.valueOf(0);
protected static final Integer IS_JAR = Integer.valueOf(1);
@@ -196,8 +200,14 @@ public final class ClassLoaderFactory {
} else if ( types[i] == IS_GLOB ) {
File directory=new File(location);
if (!directory.exists() || !directory.isDirectory() ||
- !directory.canRead())
+ !directory.canRead()) {
+
log.warn(sm.getString("classLoaderFactory.badDirectory",
+ directory.getAbsolutePath(),
+ Boolean.valueOf(directory.exists()),
+ Boolean.valueOf(directory.isDirectory()),
+ Boolean.valueOf(directory.canRead())));
continue;
+ }
if (log.isDebugEnabled())
log.debug(" Including directory glob "
+ directory.getAbsolutePath());
Modified: tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties?rev=1072145&r1=1072144&r2=1072145&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties Fri
Feb 18 20:58:16 2011
@@ -16,6 +16,7 @@
catalina.configFail=Unable to load server configuration from [{0}]
catalina.shutdownHookFail=The shutdown hook experienced an error while trying
to stop the server
catalina.stopServer=No shutdown port configured. Shut down server through OS
signal. Server not shut down.
+classLoaderFactory.badDirectory=Problem with directory [{0}], exists: [{1}],
isDirectory: [{2}], canRead: [{4}]
contextConfig.altDDNotFound=alt-dd file {0} not found
contextConfig.applicationUrl=Unable to determine URL for application web.xml
contextConfig.applicationMissing=Missing application web.xml, using defaults
only
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1072145&r1=1072144&r2=1072145&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Feb 18 20:58:16 2011
@@ -45,6 +45,10 @@
<section name="Tomcat 7.0.9 (markt)">
<subsection name="Catalina">
<changelog>
+ <fix>
+ <bug>48863</bug>: Better logging when specifying an invalid directory
+ for a class loader. Based on a patch by Ralf Hauser. (markt)
+ </fix>
<add>
Enhance the RemoteIpFilter and RemoteIpValve so that the modified
remote
address, remote host, protocol and server port may be used in an access
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
