Author: kkolinko
Date: Sat Dec 14 11:03:09 2013
New Revision: 1550921
URL: http://svn.apache.org/r1550921
Log:
Merged r1550743 from tomcat/trunk:
Fix a find bugs warning about String comparison
This slightly improves performance in the rare/unlikely case when one
explicitly sets contextClass property as equal to the default value. It can now
reuse the existing Digester instead of creating a new one.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1550743
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java?rev=1550921&r1=1550920&r2=1550921&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java Sat
Dec 14 11:03:09 2013
@@ -225,7 +225,7 @@ public class HostConfig
String oldContextClass = this.contextClass;
this.contextClass = contextClass;
- if (oldContextClass != contextClass) {
+ if (!oldContextClass.equals(contextClass)) {
synchronized (digesterLock) {
digester = createDigester(getContextClass());
}
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1550921&r1=1550920&r2=1550921&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Sat Dec 14 11:03:09 2013
@@ -64,6 +64,10 @@
ignored until Tomcat was restarted. Now (assuming automatic deployment
is enabled) it will trigger a redeploy of the web application. (markt)
</fix>
+ <fix>
+ Fix string comparison in <code>HostConfig.setContextClass()</code>.
+ (kkolinko)
+ </fix>
</changelog>
</subsection>
<subsection name="Cluster">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
