svn commit: r1494925 - /tomcat/trunk/java/org/apache/catalina/core/StandardContext.java

[markt]

Author: markt
Date: Thu Jun 20 11:03:22 2013
New Revision: 1494925

URL: http://svn.apache.org/r1494925
Log:
Fix some copy/paste errors

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

Modified: tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1494925&r1=1494924&r2=1494925&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Thu Jun 20 
11:03:22 2013
@@ -5384,7 +5384,7 @@ public class StandardContext extends Con
                 // Pre-calculate so we don't do this for every iteration of the
                 // following loop
                 List<String> omNew = null;
-                if (omittedMethods.length == 0) {
+                if (omittedMethods.length != 0) {
                     omNew = Arrays.asList(omittedMethods);
                 }
 
@@ -5397,9 +5397,11 @@ public class StandardContext extends Con
                             Set<String> om = urlOmittedMethodMap.get(pattern);
                             if (om == null) {
                                 om = new HashSet<>();
-                                urlMethodMap.put(pattern, om);
+                                urlOmittedMethodMap.put(pattern, om);
+                                om.addAll(omNew);
+                            } else {
+                                om.retainAll(omNew);
                             }
-                            om.retainAll(omNew);
                         } else {
                             // Build the union of methods for this pattern
                             Set<String> m = urlMethodMap.get(pattern);



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