From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 19 May 2010 13:03:57 +0000 (+0000)
Subject: Move encoding outside the loop
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=a95bbf3b6c35b07a6a50f81ab4873e0de0ec6279;p=tomcat7.0

Move encoding outside the loop

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@946168 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/java/org/apache/catalina/connector/CoyoteAdapter.java b/java/org/apache/catalina/connector/CoyoteAdapter.java
index 29b39ac62..9027a7954 100644
--- a/java/org/apache/catalina/connector/CoyoteAdapter.java
+++ b/java/org/apache/catalina/connector/CoyoteAdapter.java
@@ -646,18 +646,15 @@ public class CoyoteAdapter implements Adapter {
         
         ByteChunk uriBC = req.decodedURI().getByteChunk();
         int semicolon = uriBC.indexOf(';', 0);
-        String enc = null;
+
+        // What encoding to use? Some platforms, eg z/os, use a default
+        // encoding that doesn't give the expected result so be explicit
+        String enc = connector.getURIEncoding();
+        if (enc == null) {
+            enc = "ISO-8859-1";
+        }
         
         while (semicolon > -1) {
-            if (enc == null) {
-                // What encoding to use? Some platforms, eg z/os, use a default
-                // encoding that doesn't give the expected result so be explicit
-                enc = connector.getURIEncoding();
-                if (enc == null) {
-                    enc = "ISO-8859-1";
-                }
-            }
-            
             // Parse path param, and extract it from the decoded request URI
             int start = uriBC.getStart();
             int end = uriBC.getEnd();