You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2020/05/14 09:04:19 UTC
[tomcat] 01/03: Revert "Fix IDE warnings"
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 2ce13618e9deb09ba025bfbfcf7767bdc4f81d9d
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu May 14 09:39:14 2020 +0100
Revert "Fix IDE warnings"
This reverts commit 4efa2eca68bb64996eac03ac139453d692621183.
---
java/org/apache/catalina/valves/rewrite/RewriteRule.java | 4 ++--
java/org/apache/juli/ClassLoaderLogManager.java | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/java/org/apache/catalina/valves/rewrite/RewriteRule.java b/java/org/apache/catalina/valves/rewrite/RewriteRule.java
index efdb8ac..0aa96de 100644
--- a/java/org/apache/catalina/valves/rewrite/RewriteRule.java
+++ b/java/org/apache/catalina/valves/rewrite/RewriteRule.java
@@ -86,7 +86,7 @@ public class RewriteRule {
* @return <code>null</code> if no rewrite took place
*/
public CharSequence evaluate(CharSequence url, Resolver resolver) {
- Pattern pattern = RewriteRule.pattern.get();
+ Pattern pattern = this.pattern.get();
if (pattern == null) {
// Parse the pattern
int flags = 0;
@@ -94,7 +94,7 @@ public class RewriteRule {
flags |= Pattern.CASE_INSENSITIVE;
}
pattern = Pattern.compile(patternString, flags);
- RewriteRule.pattern.set(pattern);
+ this.pattern.set(pattern);
}
Matcher matcher = pattern.matcher(url);
// Use XOR
diff --git a/java/org/apache/juli/ClassLoaderLogManager.java b/java/org/apache/juli/ClassLoaderLogManager.java
index c907056..cf3ad4c 100644
--- a/java/org/apache/juli/ClassLoaderLogManager.java
+++ b/java/org/apache/juli/ClassLoaderLogManager.java
@@ -277,7 +277,7 @@ public class ClassLoaderLogManager extends LogManager {
return null;
}
- String prefix = ClassLoaderLogManager.prefix.get();
+ String prefix = this.prefix.get();
String result = null;
// If a prefix is defined look for a prefixed property first
@@ -595,13 +595,13 @@ public class ClassLoaderLogManager extends LogManager {
}
}
try {
- ClassLoaderLogManager.prefix.set(prefix);
+ this.prefix.set(prefix);
Handler handler = (Handler) classLoader.loadClass(
handlerClassName).getConstructor().newInstance();
// The specification strongly implies all configuration should be done
// during the creation of the handler object.
// This includes setting level, filter, formatter and encoding.
- ClassLoaderLogManager.prefix.set(null);
+ this.prefix.set(null);
info.handlers.put(handlerName, handler);
if (rootHandlers == null) {
localRootLogger.addHandler(handler);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org