Author: csutherl
Date: Mon Jun 4 15:07:57 2018
New Revision: 1832856
URL: http://svn.apache.org/viewvc?rev=1832856&view=rev
Log:
Fix potential NullPointerException in replaceSystemProperties() seemingly
caused by changing StringManager sm declaration to static
Modified:
tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java
tomcat/trunk/webapps/docs/changelog.xml
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=1832856&r1=1832855&r2=1832856&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java Mon Jun 4
15:07:57 2018
@@ -84,6 +84,7 @@ public class Digester extends DefaultHan
protected static IntrospectionUtils.PropertySource propertySource;
private static boolean propertySourceSet = false;
+ protected static final StringManager sm =
StringManager.getManager(Digester.class);
static {
String className =
System.getProperty("org.apache.tomcat.util.digester.PROPERTY_SOURCE");
@@ -309,7 +310,6 @@ public class Digester extends DefaultHan
* The Log to which most logging calls will be made.
*/
protected Log log = LogFactory.getLog(Digester.class);
- protected static final StringManager sm =
StringManager.getManager(Digester.class);
/**
* The Log to which all SAX event related logging calls will be made.
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1832856&r1=1832855&r2=1832856&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Jun 4 15:07:57 2018
@@ -191,6 +191,10 @@
not contain leading zeros in the IPv4 part. Based on a patch by Katya
Stoycheva. (markt)
</fix>
+ <fix>
+ Fix <code>NullPointerException</code> thrown from <code>
+ replaceSystemProperties()</code> when trying to log messages.
(csutherl)
+ </fix>
</changelog>
</subsection>
<subsection name="Jasper">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
