commit d135de03e3ca5bccacebeca3069cefa5078e5102
author Mark Thomas <markt@apache.org> Wed Apr 25 08:25:11 2018 +0000
committer Mark Thomas <markt@apache.org> Wed Apr 25 08:25:11 2018 +0000
tree 2ae402281a726fef115f7763e8e32435e44eb261
parent 3302d7546443af0c3e67f46b1fd334ab997359eb

Optimise
Patch provided by Sebastian Staudt

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc8.0.x/trunk@1830053 13f79535-47bb-0310-9956-ffa450edef68

java/org/apache/catalina/startup/HostConfig.java

diff --git a/java/org/apache/catalina/startup/HostConfig.java b/java/org/apache/catalina/startup/HostConfig.java
index 35b7cbe..5dd17e2 100644
--- a/java/org/apache/catalina/startup/HostConfig.java
+++ b/java/org/apache/catalina/startup/HostConfig.java
@@ -1650,13 +1650,14 @@
      * now unused (have no active sessions) and undeploy any that are found.
      */
     public synchronized void checkUndeploy() {
+        if (deployed.size() < 2) {
+            return;
+        }
+
         // Need ordered set of names
         SortedSet<String> sortedAppNames = new TreeSet<>();
         sortedAppNames.addAll(deployed.keySet());
 
-        if (sortedAppNames.size() < 2) {
-            return;
-        }
         Iterator<String> iter = sortedAppNames.iterator();
 
         ContextName previous = new ContextName(iter.next(), false);