svn commit: r1041469 - in /tomcat/trunk: java/org/apache/catalina/ha/session/JvmRouteBinderValve.java java/org/apache/catalina/ha/session/LocalStrings.properties java/org/apache/tomcat/util/digester/Digester.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Thu Dec  2 17:15:08 2010
New Revision: 1041469

URL: http://svn.apache.org/viewvc?rev=1041469&view=rev
Log:
Don't pass null to log messages.
Found by FindBugs

Modified:
    tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
    tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties
    tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java
    tomcat/trunk/webapps/docs/changelog.xml

Modified: 
tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java?rev=1041469&r1=1041468&r2=1041469&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java 
Thu Dec  2 17:15:08 2010
@@ -268,7 +268,7 @@ public class JvmRouteBinderValve extends
             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;
     }

Modified: 
tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties?rev=1041469&r1=1041468&r2=1041469&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties 
Thu Dec  2 17:15:08 2010
@@ -78,7 +78,7 @@ jvmRoute.lostSession=Lost Session [{0}] 
 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!

Modified: tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java?rev=1041469&r1=1041468&r2=1041469&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java Thu Dec  2 
17:15:08 2010
@@ -1416,7 +1416,7 @@ public class Digester extends DefaultHan
             if (systemId == null) {
                 // cannot resolve
                 if (log.isDebugEnabled()) {
-                    log.debug(" Cannot resolve entity: '" + entityURL + "'");
+                    log.debug(" Cannot resolve entity: '" + publicId + "'");
                 }
                 return (null);
                 

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1041469&r1=1041468&r2=1041469&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Dec  2 17:15:08 2010
@@ -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">



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org