Author: markt Date: Tue Jan 19 23:27:17 2016 New Revision: 1725651 URL: http://svn.apache.org/viewvc?rev=1725651&view=rev Log: Use distributable and sessionTimeout from Context rather than values copied to Manager since the Context values (should) always take precedence and overwrite anything set on the Manager.
Modified: tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java tomcat/trunk/java/org/apache/catalina/session/StandardSession.java tomcat/trunk/java/org/apache/catalina/storeconfig/StandardContextSF.java Modified: tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java?rev=1725651&r1=1725650&r2=1725651&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java (original) +++ tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java Tue Jan 19 23:27:17 2016 @@ -491,14 +491,11 @@ public final class HTMLManagerServlet ex args[8] = RequestUtil.filter(response.encodeURL(request .getContextPath() + "/html/expire?" + pathVersion)); args[9] = appsExpire; - args[10] = smClient.getString( - "htmlManagerServlet.expire.explain"); + args[10] = smClient.getString("htmlManagerServlet.expire.explain"); if (manager == null) { - args[11] = smClient.getString( - "htmlManagerServlet.noManager"); + args[11] = smClient.getString("htmlManagerServlet.noManager"); } else { - args[11] = Integer.valueOf( - ctxt.getManager().getMaxInactiveInterval()/60); + args[11] = Integer.valueOf(ctxt.getSessionTimeout()); } args[12] = smClient.getString("htmlManagerServlet.expire.unit"); args[13] = highlightColor; Modified: tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java?rev=1725651&r1=1725650&r2=1725651&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java (original) +++ tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java Tue Jan 19 23:27:17 2016 @@ -1195,7 +1195,7 @@ public class ManagerServlet extends Http } int maxCount = 60; int histoInterval = 1; - int maxInactiveInterval = manager.getMaxInactiveInterval()/60; + int maxInactiveInterval = context.getSessionTimeout(); if (maxInactiveInterval > 0) { histoInterval = maxInactiveInterval / maxCount; if (histoInterval * maxCount < maxInactiveInterval) 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=1725651&r1=1725650&r2=1725651&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/session/StandardSession.java (original) +++ tomcat/trunk/java/org/apache/catalina/session/StandardSession.java Tue Jan 19 23:27:17 2016 @@ -1462,7 +1462,7 @@ public class StandardSession implements throw new IllegalStateException(sm.getString( "standardSession.setAttribute.ise", getIdInternal())); } - if ((manager != null) && manager.getDistributable() && + if ((manager != null) && manager.getContext().getDistributable() && !isAttributeDistributable(name, value) && !exclude(name, value)) { throw new IllegalArgumentException(sm.getString( "standardSession.setAttribute.iae", name)); Modified: tomcat/trunk/java/org/apache/catalina/storeconfig/StandardContextSF.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/storeconfig/StandardContextSF.java?rev=1725651&r1=1725650&r2=1725651&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/storeconfig/StandardContextSF.java (original) +++ tomcat/trunk/java/org/apache/catalina/storeconfig/StandardContextSF.java Tue Jan 19 23:27:17 2016 @@ -242,7 +242,7 @@ public class StandardContextSF extends S storeElement(aWriter, indent, loader); // Store nested <Manager> elements - if (context.getCluster() == null || !context.getManager().getDistributable()) { + if (context.getCluster() == null || !context.getDistributable()) { Manager manager = context.getManager(); storeElement(aWriter, indent, manager); } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org