You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2012/10/22 23:48:32 UTC

svn commit: r1401092 - /tomcat/trunk/java/org/apache/catalina/connector/Connector.java

Author: markt
Date: Mon Oct 22 21:48:32 2012
New Revision: 1401092

URL: http://svn.apache.org/viewvc?rev=1401092&view=rev
Log:
FindBugs: Avoid possible NPE.

Modified:
    tomcat/trunk/java/org/apache/catalina/connector/Connector.java

Modified: tomcat/trunk/java/org/apache/catalina/connector/Connector.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Connector.java?rev=1401092&r1=1401091&r2=1401092&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/Connector.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Connector.java Mon Oct 22 21:48:32 2012
@@ -765,7 +765,11 @@ public class Connector extends Lifecycle
       */
      public void setURIEncoding(String URIEncoding) {
          this.URIEncoding = URIEncoding;
-         this.URIEncodingLower = URIEncoding.toLowerCase(Locale.US);
+         if (URIEncoding == null) {
+             URIEncodingLower = null;
+         } else {
+             this.URIEncodingLower = URIEncoding.toLowerCase(Locale.US);
+         }
          setProperty("uRIEncoding", URIEncoding);
      }
 



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