Author: markt
Date: Sat Jan 30 00:29:52 2016
New Revision: 1727670
URL: http://svn.apache.org/viewvc?rev=1727670&view=rev
Log:
Fix potential NPE when clustering
Modified:
tomcat/trunk/java/org/apache/catalina/session/StandardSession.java
Modified: tomcat/trunk/java/org/apache/catalina/session/StandardSession.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/StandardSession.java?rev=1727670&r1=1727669&r2=1727670&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/session/StandardSession.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/session/StandardSession.java Sat Jan
30 00:29:52 2016
@@ -1755,8 +1755,17 @@ public class StandardSession implements
if (Constants.excludedAttributeNames.contains(name)) {
return true;
}
+
+ // Manager is required for remaining check
+ Manager manager = getManager();
+ if (manager == null) {
+ // Manager may be null during replication of new sessions in a
+ // cluster. Avoid the NPE.
+ return false;
+ }
+
// Last check so use a short-cut
- return !getManager().willAttributeDistribute(name, value);
+ return !manager.willAttributeDistribute(name, value);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
