date:20200519

[Bug 64427] --enable-preview no error in log

2020-05-19 Thread bugzilla

https://bz.apache.org/bugzilla/show_bug.cgi?id=64427

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |NEEDINFO

--- Comment #8 from Mark Thomas  ---
I've just tried a basic test and I see a 500 error when I try to access a
Servlet that uses a Record when --enable-preview is not enabled.

>From the stack trace the application where this error was seen looks to be
doing something slightly more complex. Rather than try and reverse engineer
things from the stack trace, please can you provide the simplest web
application (with source code) that reproduces this error so we can track down
exactly what is getting swallowed where and work out the best way to fix it.

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] branch 7.0.x updated: Remove fixme

2020-05-19 Thread remm

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

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


The following commit(s) were added to refs/heads/7.0.x by this push:
 new 79493d8  Remove fixme
79493d8 is described below

commit 79493d80f5ad610888d3f1e0a27998f0e09f23da
Author: remm 
AuthorDate: Tue May 19 16:50:21 2020 +0200

Remove fixme

This is already a facade, so all is fine.
---
 java/org/apache/catalina/session/StandardSessionFacade.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/java/org/apache/catalina/session/StandardSessionFacade.java 
b/java/org/apache/catalina/session/StandardSessionFacade.java
index b8a2965..f212977 100644
--- a/java/org/apache/catalina/session/StandardSessionFacade.java
+++ b/java/org/apache/catalina/session/StandardSessionFacade.java
@@ -82,7 +82,6 @@ public class StandardSessionFacade
 
 @Override
 public ServletContext getServletContext() {
-// FIXME : Facade this object ?
 return session.getServletContext();
 }
 


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

[tomcat] branch 8.5.x updated: Remove fixme

2020-05-19 Thread remm

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 793da17  Remove fixme
793da17 is described below

commit 793da17b8f4bf6fa8566e1da35d8c915cefc202b
Author: remm 
AuthorDate: Tue May 19 16:50:21 2020 +0200

Remove fixme

This is already a facade, so all is fine.
---
 java/org/apache/catalina/session/StandardSessionFacade.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/java/org/apache/catalina/session/StandardSessionFacade.java 
b/java/org/apache/catalina/session/StandardSessionFacade.java
index fbf4349..6efa146 100644
--- a/java/org/apache/catalina/session/StandardSessionFacade.java
+++ b/java/org/apache/catalina/session/StandardSessionFacade.java
@@ -70,7 +70,6 @@ public class StandardSessionFacade implements HttpSession {
 
 @Override
 public ServletContext getServletContext() {
-// FIXME : Facade this object ?
 return session.getServletContext();
 }
 


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

[tomcat] branch 9.0.x updated: Remove fixme

2020-05-19 Thread remm

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

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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new 560914e  Remove fixme
560914e is described below

commit 560914e394ee3290252698700446e4ae5aa4c8ae
Author: remm 
AuthorDate: Tue May 19 16:50:21 2020 +0200

Remove fixme

This is already a facade, so all is fine.
---
 java/org/apache/catalina/session/StandardSessionFacade.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/java/org/apache/catalina/session/StandardSessionFacade.java 
b/java/org/apache/catalina/session/StandardSessionFacade.java
index fbf4349..6efa146 100644
--- a/java/org/apache/catalina/session/StandardSessionFacade.java
+++ b/java/org/apache/catalina/session/StandardSessionFacade.java
@@ -70,7 +70,6 @@ public class StandardSessionFacade implements HttpSession {
 
 @Override
 public ServletContext getServletContext() {
-// FIXME : Facade this object ?
 return session.getServletContext();
 }
 


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

[tomcat] branch master updated: Remove fixme

2020-05-19 Thread remm

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

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


The following commit(s) were added to refs/heads/master by this push:
 new bae1fae  Remove fixme
bae1fae is described below

commit bae1fae737d8d3fbab259ba469b65215d62731dc
Author: remm 
AuthorDate: Tue May 19 16:50:21 2020 +0200

Remove fixme

This is already a facade, so all is fine.
---
 java/org/apache/catalina/session/StandardSessionFacade.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/java/org/apache/catalina/session/StandardSessionFacade.java 
b/java/org/apache/catalina/session/StandardSessionFacade.java
index 04bc3f7..4c88831 100644
--- a/java/org/apache/catalina/session/StandardSessionFacade.java
+++ b/java/org/apache/catalina/session/StandardSessionFacade.java
@@ -70,7 +70,6 @@ public class StandardSessionFacade implements HttpSession {
 
 @Override
 public ServletContext getServletContext() {
-// FIXME : Facade this object ?
 return session.getServletContext();
 }
 


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

[tomcat] branch 9.0.x updated: Fix use of multiple parameters when defining RewriteMaps

2020-05-19 Thread remm

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

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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new ea5061f  Fix use of multiple parameters when defining RewriteMaps
ea5061f is described below

commit ea5061f93b9131b6257bce585c190de3bf6e5fe7
Author: remm 
AuthorDate: Tue May 19 16:12:30 2020 +0200

Fix use of multiple parameters when defining RewriteMaps

Missing part of PR #221.
---
 .../catalina/valves/rewrite/LocalStrings.properties   |  2 ++
 java/org/apache/catalina/valves/rewrite/RewriteMap.java   |  5 -
 java/org/apache/catalina/valves/rewrite/RewriteValve.java | 15 ++-
 .../apache/catalina/valves/rewrite/TestRewriteValve.java  |  6 ++
 .../apache/catalina/valves/rewrite/TesterRewriteMapA.java |  6 +-
 webapps/docs/changelog.xml|  4 
 6 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/java/org/apache/catalina/valves/rewrite/LocalStrings.properties 
b/java/org/apache/catalina/valves/rewrite/LocalStrings.properties
index e67d4ba..c7541e7 100644
--- a/java/org/apache/catalina/valves/rewrite/LocalStrings.properties
+++ b/java/org/apache/catalina/valves/rewrite/LocalStrings.properties
@@ -15,6 +15,8 @@
 
 quotedStringTokenizer.tokenizeError=Error tokenizing text [{0}] after position 
[{1}] from mode [{2}]
 
+rewriteMap.tooManyParameters=Too many parameters for this map
+
 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/RewriteMap.java 
b/java/org/apache/catalina/valves/rewrite/RewriteMap.java
index 43315e7..5ca73e7 100644
--- a/java/org/apache/catalina/valves/rewrite/RewriteMap.java
+++ b/java/org/apache/catalina/valves/rewrite/RewriteMap.java
@@ -16,6 +16,8 @@
  */
 package org.apache.catalina.valves.rewrite;
 
+import org.apache.tomcat.util.res.StringManager;
+
 /**
  * Interface for user defined lookup/replacement logic that can be defined in
  * a {@code rewrite.config} file by a {@code RewriteMap} directive. Such a map
@@ -56,7 +58,8 @@ public interface RewriteMap {
 return;
 }
 if (params.length > 1) {
-throw new IllegalArgumentException("Too many parameters for this 
map");
+throw new IllegalArgumentException(
+
StringManager.getManager(RewriteMap.class).getString("rewriteMap.tooManyParameters"));
 }
 setParameters(params[0]);
 }
diff --git a/java/org/apache/catalina/valves/rewrite/RewriteValve.java 
b/java/org/apache/catalina/valves/rewrite/RewriteValve.java
index 70d204b..c633bb2 100644
--- a/java/org/apache/catalina/valves/rewrite/RewriteValve.java
+++ b/java/org/apache/catalina/valves/rewrite/RewriteValve.java
@@ -630,12 +630,17 @@ public class RewriteValve extends ValveBase {
 throw new 
IllegalArgumentException(sm.getString("rewriteValve.invalidMapClassName", 
line));
 }
 if (tokenizer.hasMoreTokens()) {
-map.setParameters(tokenizer.nextToken());
+if (tokenizer.countTokens() == 1) {
+map.setParameters(tokenizer.nextToken());
+} else {
+List params = new ArrayList<>();
+while (tokenizer.hasMoreTokens()) {
+params.add(tokenizer.nextToken());
+}
+map.setParameters(params.toArray(new String[0]));
+}
 }
-Object[] result = new Object[2];
-result[0] = name;
-result[1] = map;
-return result;
+return new Object[] { name, map };
 } else if (token.startsWith("#")) {
 // it's a comment, ignore it
 } else {
diff --git a/test/org/apache/catalina/valves/rewrite/TestRewriteValve.java 
b/test/org/apache/catalina/valves/rewrite/TestRewriteValve.java
index 134f45a..4c9a97c 100644
--- a/test/org/apache/catalina/valves/rewrite/TestRewriteValve.java
+++ b/test/org/apache/catalina/valves/rewrite/TestRewriteValve.java
@@ -107,6 +107,12 @@ public class TestRewriteValve extends TomcatBaseTest {
 }
 
 @Test
+public void testRewriteMap07() throws Exception {
+doTestRewrite("RewriteMap mapa 
org.apache.catalina.valves.rewrite.TesterRewriteMapA foo bar\n" +
+"RewriteRule /b/.* /c/${mapa:${mapa:a}}", "/b/a.html", 
"/c/");
+}
+
+@Test
 public void testRewriteServerVar() throws Exception {
 doTestRewrite("RewriteRule /b/(.*).html$ /c%{SERVLET_PATH}", 
"/b/x.html", "/c/b/x.html");
 }
diff --git a/test/org/apache/catalina/valves/rewrite/TesterRewriteMapA.java 
b/test/org/ap

buildbot success in on tomcat-trunk

2020-05-19 Thread buildbot

The Buildbot has detected a restored build on builder tomcat-trunk while 
building tomcat. Full details are available at:
https://ci.apache.org/builders/tomcat-trunk/builds/5191

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: asf946_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' 
triggered this build
Build Source Stamp: [branch master] 61b8b76571bc10a0fd7e8199122ae96154992fad
Blamelist: remm 

Build succeeded!

Sincerely,
 -The Buildbot




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

[tomcat] branch master updated: Fix use of multiple parameters when defining RewriteMaps

2020-05-19 Thread remm

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

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


The following commit(s) were added to refs/heads/master by this push:
 new 8efcc6c  Fix use of multiple parameters when defining RewriteMaps
8efcc6c is described below

commit 8efcc6c9cd072bd270895c642938e268f452922c
Author: remm 
AuthorDate: Tue May 19 16:12:30 2020 +0200

Fix use of multiple parameters when defining RewriteMaps

Missing part of PR #221.
---
 .../catalina/valves/rewrite/LocalStrings.properties   |  2 ++
 java/org/apache/catalina/valves/rewrite/RewriteMap.java   |  5 -
 java/org/apache/catalina/valves/rewrite/RewriteValve.java | 15 ++-
 .../apache/catalina/valves/rewrite/TestRewriteValve.java  |  6 ++
 .../apache/catalina/valves/rewrite/TesterRewriteMapA.java |  6 +-
 webapps/docs/changelog.xml|  4 
 6 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/java/org/apache/catalina/valves/rewrite/LocalStrings.properties 
b/java/org/apache/catalina/valves/rewrite/LocalStrings.properties
index e67d4ba..c7541e7 100644
--- a/java/org/apache/catalina/valves/rewrite/LocalStrings.properties
+++ b/java/org/apache/catalina/valves/rewrite/LocalStrings.properties
@@ -15,6 +15,8 @@
 
 quotedStringTokenizer.tokenizeError=Error tokenizing text [{0}] after position 
[{1}] from mode [{2}]
 
+rewriteMap.tooManyParameters=Too many parameters for this map
+
 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/RewriteMap.java 
b/java/org/apache/catalina/valves/rewrite/RewriteMap.java
index 43315e7..5ca73e7 100644
--- a/java/org/apache/catalina/valves/rewrite/RewriteMap.java
+++ b/java/org/apache/catalina/valves/rewrite/RewriteMap.java
@@ -16,6 +16,8 @@
  */
 package org.apache.catalina.valves.rewrite;
 
+import org.apache.tomcat.util.res.StringManager;
+
 /**
  * Interface for user defined lookup/replacement logic that can be defined in
  * a {@code rewrite.config} file by a {@code RewriteMap} directive. Such a map
@@ -56,7 +58,8 @@ public interface RewriteMap {
 return;
 }
 if (params.length > 1) {
-throw new IllegalArgumentException("Too many parameters for this 
map");
+throw new IllegalArgumentException(
+
StringManager.getManager(RewriteMap.class).getString("rewriteMap.tooManyParameters"));
 }
 setParameters(params[0]);
 }
diff --git a/java/org/apache/catalina/valves/rewrite/RewriteValve.java 
b/java/org/apache/catalina/valves/rewrite/RewriteValve.java
index 20d8ba0..d2c40a6 100644
--- a/java/org/apache/catalina/valves/rewrite/RewriteValve.java
+++ b/java/org/apache/catalina/valves/rewrite/RewriteValve.java
@@ -630,12 +630,17 @@ public class RewriteValve extends ValveBase {
 throw new 
IllegalArgumentException(sm.getString("rewriteValve.invalidMapClassName", 
line));
 }
 if (tokenizer.hasMoreTokens()) {
-map.setParameters(tokenizer.nextToken());
+if (tokenizer.countTokens() == 1) {
+map.setParameters(tokenizer.nextToken());
+} else {
+List params = new ArrayList<>();
+while (tokenizer.hasMoreTokens()) {
+params.add(tokenizer.nextToken());
+}
+map.setParameters(params.toArray(new String[0]));
+}
 }
-Object[] result = new Object[2];
-result[0] = name;
-result[1] = map;
-return result;
+return new Object[] { name, map };
 } else if (token.startsWith("#")) {
 // it's a comment, ignore it
 } else {
diff --git a/test/org/apache/catalina/valves/rewrite/TestRewriteValve.java 
b/test/org/apache/catalina/valves/rewrite/TestRewriteValve.java
index 134f45a..4c9a97c 100644
--- a/test/org/apache/catalina/valves/rewrite/TestRewriteValve.java
+++ b/test/org/apache/catalina/valves/rewrite/TestRewriteValve.java
@@ -107,6 +107,12 @@ public class TestRewriteValve extends TomcatBaseTest {
 }
 
 @Test
+public void testRewriteMap07() throws Exception {
+doTestRewrite("RewriteMap mapa 
org.apache.catalina.valves.rewrite.TesterRewriteMapA foo bar\n" +
+"RewriteRule /b/.* /c/${mapa:${mapa:a}}", "/b/a.html", 
"/c/");
+}
+
+@Test
 public void testRewriteServerVar() throws Exception {
 doTestRewrite("RewriteRule /b/(.*).html$ /c%{SERVLET_PATH}", 
"/b/x.html", "/c/b/x.html");
 }
diff --git a/test/org/apache/catalina/valves/rewrite/TesterRewriteMapA.java 
b/test/org/

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

2020-05-19 Thread remm

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 
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 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-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

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

2020-05-19 Thread remm

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

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


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

commit 28a9d73c04b4a64baa4105738f1a7ada6f37fc91
Author: remm 
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 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-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] branch master updated: Add missing string

2020-05-19 Thread remm

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

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


The following commit(s) were added to refs/heads/master by this push:
 new 61b8b76  Add missing string
61b8b76 is described below

commit 61b8b76571bc10a0fd7e8199122ae96154992fad
Author: remm 
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 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-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: [VOTE] Release Apache Tomcat 7.0.104

2020-05-19 Thread Konstantin Kolinko

пн, 18 мая 2020 г. в 20:34, Violeta Georgieva :
>
> I removed the first location because commons-logging 1.1.3 is now available 
> only from the archives.
> So there is no need to check another location.
> Do we intend to update commons-logging version?

1. I am OK for keeping it at 1.1.3, and your patch is a good fix if we
are keeping it at 1.1.3.

2. Personally, I would like it to be updated to 1.2, but
- as we have not done so yet there may be some reason.
- with EOL for 7.0.x coming there is not much interest in such update.

I think that Apache Commons Logging 1.2 does not build a separate
*-adapters.jar, and so our building & shipping of
/extras/tomcat-juli-adapters.jar will be affected.

3. Unrelated to that, the original issue with "downloadfile-2" may
bite someone in the future, as it is used in other versions of Tomcat
as well.

I am glad that I was able to narrow it down to a behaviour change in Java.

I suspect that it is a deal with how redirects are followed. Maybe it
is a deal with http -> https redirection. (As 'base-apache.loc.1'
value uses http:) I wonder whether the behaviour differs for GET vs
HEAD requests.

На пн, 18.05.2020 г. в 19:29 Konstantin Kolinko  написа:
> >
> > пн, 18 мая 2020 г. в 16:20, Violeta Georgieva :
> > >
> > >
> > >
> > > На пт, 8.05.2020 г. в 11:03 Rainer Jung  написа:
> > > >
> > > > It seems commons-logging 1.1.3 is no longer part of the mirrors (only in
> > > > the archive). I had to use
> > > >
> > > > commons-logging.version=1.2
> > > > commons-logging-src.checksum.value=ce977548f1cbf46918e93cd38ac35163|0a134d01e9aeb09b33f4c7450fb41abb7bed9db6
> > > >
> > > > instead of
> > > >
> > > > commons-logging.version=1.1.3
> > > > commons-logging-src.checksum.value=e8e197d628436490886d17cffa108fe3|95f0805de0be927c42f5f6eb14b643cb37e7caad
> > > >
> > > >
> > > > to successfully build.
> > >
> > > This should be fixed
> > > https://github.com/apache/tomcat/commit/d13d3f6d7bdabab543e134bbf7e29621524db3ca
> > >
> > > Can you try it?
> >
> > The "downloadfile-2" target in build.xml should automatically switch
> > from main server to the archive.
> >
> > IIRC, it relies on a check that does a HEAD request.
> >
> > "base-apache.loc.1" URL in build.properties.default was last changed
> > on 2018-07-30
> >
> > Testing, 7.0.104, it depends on the version of Java:
> > - commons-logging-1.1.3 is correctly downloaded when running with Ant
> > 1.9.14 and Java 8u252 (jdk-8.0.252.09-hotspot from AdoptOpenJDK)
> > - The download fails when running with Java 14.0.1 (OpenJDK from Oracle)
> >
> > In February 2020 I was successfully running the downloads with Java 13
> > (13.0.2? for Tomcat 7.0.100).
> >
> > So the issue is caused by some change in the JDK.
> > [...]

Best regards,
Konstantin Kolinko

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

[Bug 64427] --enable-preview no error in log

[tomcat] branch 7.0.x updated: Remove fixme

[tomcat] branch 8.5.x updated: Remove fixme

[tomcat] branch 9.0.x updated: Remove fixme

[tomcat] branch master updated: Remove fixme

[tomcat] branch 9.0.x updated: Fix use of multiple parameters when defining RewriteMaps

buildbot success in on tomcat-trunk

[tomcat] branch master updated: Fix use of multiple parameters when defining RewriteMaps

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

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

[tomcat] branch master updated: Add missing string

Re: [VOTE] Release Apache Tomcat 7.0.104

12 matches

Site Navigation

Mail list logo

Footer information