Don't pass null to log messages.

Found by FindBugs

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1041469 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java b/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
index 699cd0e..44c65d5 100644 (file)
--- a/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
+++ b/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
@@ -268,7 +268,7 @@ public class JvmRouteBinderValve extends ValveBase implements ClusterValve {
             if(manager != null)
                 log.debug(sm.getString("jvmRoute.foundManager", manager,  request.getContext().getName()));
             else 
-                log.debug(sm.getString("jvmRoute.notFoundManager", manager,  request.getContext().getName()));
+                log.debug(sm.getString("jvmRoute.notFoundManager", request.getContext().getName()));
         }
         return manager;
     }

diff --git a/java/org/apache/catalina/ha/session/LocalStrings.properties b/java/org/apache/catalina/ha/session/LocalStrings.properties
index f098039..465fcbd 100644 (file)
--- a/java/org/apache/catalina/ha/session/LocalStrings.properties
+++ b/java/org/apache/catalina/ha/session/LocalStrings.properties
@@ -78,7 +78,7 @@ jvmRoute.lostSession=Lost Session [{0}] at path [{1}]
 jvmRoute.missingJvmRouteAttribute=No engine jvmRoute attribute configured!
 jvmRoute.newSessionCookie=Setting cookie with session id [{0}] name: [{1}] path: [{2}] secure: [{3}] httpOnly: [{4}]
 jvmRoute.noCluster=The JvmRouterBinderValve is configured, but clustering is not being used. Fail over will still work, providing a PersistentManager is used.
-jvmRoute.notFoundManager=Not found Cluster DeltaManager {0} at {1}
+jvmRoute.notFoundManager=Not found Cluster DeltaManager at {0}
 jvmRoute.receiveMessage.sessionIDChanged=Cluster JvmRouteSessionIDBinderListener received orginal session ID [{0}] set to new id [{1}] for context path [{2}]
 jvmRoute.run.already=jvmRoute SessionID receiver run already
 jvmRoute.skipURLSessionIDs=Skip reassign jvm route check, sessionid comes from URL!

diff --git a/java/org/apache/tomcat/util/digester/Digester.java b/java/org/apache/tomcat/util/digester/Digester.java
index 195da2a..1a8886f 100644 (file)
--- a/java/org/apache/tomcat/util/digester/Digester.java
+++ b/java/org/apache/tomcat/util/digester/Digester.java
@@ -1416,7 +1416,7 @@ public class Digester extends DefaultHandler {
             if (systemId == null) {
                 // cannot resolve
                 if (log.isDebugEnabled()) {
-                    log.debug(" Cannot resolve entity: '" + entityURL + "'");
+                    log.debug(" Cannot resolve entity: '" + publicId + "'");
                 }
                 return (null);
                 

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 3e25305..b117932 100644 (file)
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -87,6 +87,9 @@
         Correct removal of <code>LifeCycleListenter</code>s from
         <code>Container</code>s via JMX. (markt)
       </fix>
+      <fix>
+        Don&apos;t use <code>null</code>s to construct log messages. (markt)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Coyote">