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
The following commit(s) were added to refs/heads/master by this push:
new 4efa2ec Fix IDE warnings
4efa2ec is described below
commit 4efa2eca68bb64996eac03ac139453d692621183
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon May 4 15:50:10 2020 +0100
Fix IDE warnings
---
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 0aa96de..efdb8ac 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 = this.pattern.get();
+ Pattern pattern = RewriteRule.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);
- this.pattern.set(pattern);
+ RewriteRule.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 cf3ad4c..c907056 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 = this.prefix.get();
+ String prefix = ClassLoaderLogManager.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 {
- this.prefix.set(prefix);
+ ClassLoaderLogManager.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.
- this.prefix.set(null);
+ ClassLoaderLogManager.prefix.set(null);
info.handlers.put(handlerName, handler);
if (rootHandlers == null) {
localRootLogger.addHandler(handler);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
