Author: kkolinko
Date: Sat Dec 14 11:07:03 2013
New Revision: 1550922
URL: http://svn.apache.org/r1550922
Log:
Merged r1550920 from tomcat/trunk:
Use existing local variable instead of a getter.
Spotted thanks to "manager can be null" IDE warning. No change in functionality.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1550920
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java?rev=1550922&r1=1550921&r2=1550922&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
Sat Dec 14 11:07:03 2013
@@ -513,7 +513,7 @@ public final class HTMLManagerServlet ex
if (manager instanceof DistributedManager &&
showProxySessions) {
args[5] = Integer.valueOf(
((DistributedManager)manager).getActiveSessionsFull());
- } else if (ctxt.getManager() != null){
+ } else if (manager != null){
args[5] = Integer.valueOf(manager.getActiveSessions());
} else {
args[5] = Integer.valueOf(0);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
