Author: kfujino
Date: Mon Jan 25 06:28:08 2016
New Revision: 1726576
URL: http://svn.apache.org/viewvc?rev=1726576&view=rev
Log:
Fix NPE when sessionAttributeNameFilter and
sessionAttributeValueClassNameFilter is unset in cluster environment.
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/session/ManagerBase.java
Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/session/ManagerBase.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/session/ManagerBase.java?rev=1726576&r1=1726575&r2=1726576&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/session/ManagerBase.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/session/ManagerBase.java Mon
Jan 25 06:28:08 2016
@@ -263,8 +263,9 @@ public abstract class ManagerBase extend
public void setSessionAttributeNameFilter(String
sessionAttributeNameFilter) {
if (sessionAttributeNameFilter == null ||
sessionAttributeNameFilter.length() == 0) {
sessionAttributeNamePattern = null;
+ } else {
+ sessionAttributeNamePattern =
Pattern.compile(sessionAttributeNameFilter);
}
- sessionAttributeNamePattern =
Pattern.compile(sessionAttributeNameFilter);
}
@@ -322,9 +323,10 @@ public abstract class ManagerBase extend
if (sessionAttributeValueClassNameFilter == null ||
sessionAttributeValueClassNameFilter.length() == 0) {
sessionAttributeValueClassNamePattern = null;
+ } else {
+ sessionAttributeValueClassNamePattern =
+ Pattern.compile(sessionAttributeValueClassNameFilter);
}
- sessionAttributeValueClassNamePattern =
- Pattern.compile(sessionAttributeValueClassNameFilter);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
