svn commit: r1577087 - /tomcat/trunk/java/org/apache/catalina/core/StandardContext.java

[kkolinko]

Author: kkolinko
Date: Thu Mar 13 10:23:35 2014
New Revision: 1577087

URL: http://svn.apache.org/r1577087
Log:
Reduce calls to getManager().
(That is not a simple getter, but it performs some locking).

Modified:
    tomcat/trunk/java/org/apache/catalina/core/StandardContext.java

Modified: tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1577087&r1=1577086&r2=1577087&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Thu Mar 13 
10:23:35 2014
@@ -1648,12 +1648,13 @@ public class StandardContext extends Con
                                    this.distributable);
 
         // Bugzilla 32866
-        if(getManager() != null) {
+        Manager manager = getManager();
+        if(manager != null) {
             if(log.isDebugEnabled()) {
                 log.debug("Propagating distributable=" + distributable
                           + " to manager");
             }
-            getManager().setDistributable(distributable);
+            manager.setDistributable(distributable);
         }
     }
 
@@ -5172,7 +5173,7 @@ public class StandardContext extends Con
                 // Start manager
                 Manager manager = getManager();
                 if ((manager != null) && (manager instanceof Lifecycle)) {
-                    ((Lifecycle) getManager()).start();
+                    ((Lifecycle) manager).start();
                 }
             } catch(Exception e) {
                 log.error("Error manager.start()", e);



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org