You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by re...@apache.org on 2020/05/19 13:41:57 UTC

[tomcat] branch 8.5.x updated: Add missing string

This is an automated email from the ASF dual-hosted git repository.

remm pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/8.5.x by this push:
     new d0141cc  Add missing string
d0141cc is described below

commit d0141cc3d0beff04860217a00b71820c8bc5b9ab
Author: remm <re...@apache.org>
AuthorDate: Tue May 19 15:40:18 2020 +0200

    Add missing string
---
 java/org/apache/catalina/valves/rewrite/LocalStrings.properties   | 2 ++
 .../org/apache/catalina/valves/rewrite/QuotedStringTokenizer.java | 8 ++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/java/org/apache/catalina/valves/rewrite/LocalStrings.properties b/java/org/apache/catalina/valves/rewrite/LocalStrings.properties
index 63ecfb3..e67d4ba 100644
--- a/java/org/apache/catalina/valves/rewrite/LocalStrings.properties
+++ b/java/org/apache/catalina/valves/rewrite/LocalStrings.properties
@@ -13,6 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+quotedStringTokenizer.tokenizeError=Error tokenizing text [{0}] after position [{1}] from mode [{2}]
+
 rewriteValve.closeError=Error closing configuration
 rewriteValve.invalidFlags=Invalid flag in [{0}] flags [{1}]
 rewriteValve.invalidLine=Invalid line [{0}]
diff --git a/java/org/apache/catalina/valves/rewrite/QuotedStringTokenizer.java b/java/org/apache/catalina/valves/rewrite/QuotedStringTokenizer.java
index 00aaa4a..a6204fb 100644
--- a/java/org/apache/catalina/valves/rewrite/QuotedStringTokenizer.java
+++ b/java/org/apache/catalina/valves/rewrite/QuotedStringTokenizer.java
@@ -21,8 +21,12 @@ import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 
+import org.apache.tomcat.util.res.StringManager;
+
 public class QuotedStringTokenizer {
 
+    protected static final StringManager sm = StringManager.getManager(QuotedStringTokenizer.class);
+
     private Iterator<String> tokenIterator;
     private int tokenCount;
     private int returnedTokens = 0;
@@ -70,8 +74,8 @@ public class QuotedStringTokenizer {
                 }
                 break;
             default:
-                throw new IllegalStateException(
-                        "Couldn't tokenize text '" + inputText + "' after position " + pos + " from mode " + currentMode);
+                throw new IllegalStateException(sm.getString("quotedStringTokenizer.tokenizeError",
+                                inputText, Integer.valueOf(pos), currentMode));
             }
             pos++;
         }


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