svn commit: r1494050 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/servlets/WebdavServlet.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Tue Jun 18 07:29:35 2013
New Revision: 1494050

URL: http://svn.apache.org/r1494050
Log:
Small performance improvement
Patch provided by Adrian Nistor

Modified:
    tomcat/tc7.0.x/trunk/   (props changed)
    tomcat/tc7.0.x/trunk/java/org/apache/catalina/servlets/WebdavServlet.java
    tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
  Merged /tomcat/trunk:r1494048

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/servlets/WebdavServlet.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/servlets/WebdavServlet.java?rev=1494050&r1=1494049&r2=1494050&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/servlets/WebdavServlet.java 
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/servlets/WebdavServlet.java 
Tue Jun 18 07:29:35 2013
@@ -1528,8 +1528,10 @@ public class WebdavServlet
             boolean tokenMatch = false;
             while (tokenList.hasMoreElements()) {
                 String token = tokenList.nextElement();
-                if (ifHeader.indexOf(token) != -1)
+                if (ifHeader.indexOf(token) != -1) {
                     tokenMatch = true;
+                    break;
+                }
             }
             if (!tokenMatch)
                 return true;
@@ -1549,8 +1551,10 @@ public class WebdavServlet
                 boolean tokenMatch = false;
                 while (tokenList.hasMoreElements()) {
                     String token = tokenList.nextElement();
-                    if (ifHeader.indexOf(token) != -1)
+                    if (ifHeader.indexOf(token) != -1) {
                         tokenMatch = true;
+                        break;
+                    }
                 }
                 if (!tokenMatch)
                     return true;

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=1494050&r1=1494049&r2=1494050&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Tue Jun 18 07:29:35 2013
@@ -70,8 +70,8 @@
         methods that does not include GET. (markt)
       </fix>
       <fix>
-        <bug>55110</bug>: Small performance improvements. Patch provided by
-        Adrian Nistor. (markt)
+        <bug>55110</bug> &amp; <bug>55110</bug>: Small performance 
improvements.
+        Patches provided by Adrian Nistor. (markt)
       </fix>
     </changelog>
   </subsection>



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