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 2018/05/22 19:28:48 UTC

svn commit: r1832059 - /tomcat/trunk/java/org/apache/catalina/core/ApplicationPushBuilder.java

Author: markt
Date: Tue May 22 19:28:48 2018
New Revision: 1832059

URL: http://svn.apache.org/viewvc?rev=1832059&view=rev
Log:
SpotBugs: Fix a couple of minor issues

Modified:
    tomcat/trunk/java/org/apache/catalina/core/ApplicationPushBuilder.java

Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationPushBuilder.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationPushBuilder.java?rev=1832059&r1=1832058&r2=1832059&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationPushBuilder.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationPushBuilder.java Tue May 22 19:28:48 2018
@@ -23,6 +23,7 @@ import java.util.Enumeration;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 
@@ -195,7 +196,7 @@ public class ApplicationPushBuilder impl
 
     @Override
     public PushBuilder method(String method) {
-        String upperMethod = method.trim().toUpperCase();
+        String upperMethod = method.trim().toUpperCase(Locale.ENGLISH);
         if (DISALLOWED_METHODS.contains(upperMethod) || upperMethod.length() == 0) {
             throw new IllegalArgumentException(
                     sm.getString("applicationPushBuilder.methodInvalid", upperMethod));
@@ -370,7 +371,6 @@ public class ApplicationPushBuilder impl
         coyoteRequest.action(ActionCode.PUSH_REQUEST, pushTarget);
 
         // Reset for next call to this method
-        pushTarget = null;
         path = null;
         headers.remove("if-none-match");
         headers.remove("if-modified-since");



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