Author: markt Date: Fri Mar 25 09:55:29 2011 New Revision: 1085303 URL: http://svn.apache.org/viewvc?rev=1085303&view=rev Log: Fix string comparison - reported by Veracode
Modified: tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Modified: tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=1085303&r1=1085302&r2=1085303&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java (original) +++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Fri Mar 25 09:55:29 2011 @@ -609,7 +609,7 @@ public class ContextConfig // Add as watched resource so that cascade reload occurs if a default // config file is modified/added/removed - if (contextXml.getProtocol() == "file") { + if ("file".equals(contextXml.getProtocol())) { context.addWatchedResource( (new File(contextXml.toURI())).getAbsolutePath()); } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org