Author: markt Date: Wed Sep 12 22:06:42 2018 New Revision: 1840764 URL: http://svn.apache.org/viewvc?rev=1840764&view=rev Log: Minor performance tweak. Don't create an Exception (with an expensive to populate stack trace) unless we have to.
Modified: tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java Modified: tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java?rev=1840764&r1=1840763&r2=1840764&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java (original) +++ tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java Wed Sep 12 22:06:42 2018 @@ -944,18 +944,21 @@ public abstract class ContainerBase exte results.add(startStopExecutor.submit(new StartChild(children[i]))); } - MultiThrowable multiThrowable = new MultiThrowable(); + MultiThrowable multiThrowable = null; for (Future<Void> result : results) { try { result.get(); } catch (Throwable e) { log.error(sm.getString("containerBase.threadedStartFailed"), e); + if (multiThrowable == null) { + multiThrowable = new MultiThrowable(); + } multiThrowable.add(e); } } - if (multiThrowable.size() > 0) { + if (multiThrowable != null) { throw new LifecycleException(sm.getString("containerBase.threadedStartFailed"), multiThrowable.getThrowable()); } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org