Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49144

Not an issue but stop FindBugs complaining
Also fix one other FindBugs report for this class.

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

diff --git a/java/org/apache/catalina/startup/Bootstrap.java b/java/org/apache/catalina/startup/Bootstrap.java
index 3323f31..76c5de0 100644 (file)
--- a/java/org/apache/catalina/startup/Bootstrap.java
+++ b/java/org/apache/catalina/startup/Bootstrap.java
@@ -348,7 +348,7 @@ public final class Bootstrap {
         Class<?> paramTypes[] = new Class[1];
         paramTypes[0] = Boolean.TYPE;
         Object paramValues[] = new Object[1];
-        paramValues[0] = new Boolean(await);
+        paramValues[0] = Boolean.valueOf(await);
         Method method = 
             catalinaDaemon.getClass().getMethod("setAwait", paramTypes);
         method.invoke(catalinaDaemon, paramValues);
@@ -385,13 +385,15 @@ public final class Bootstrap {
     public static void main(String args[]) {
 
         if (daemon == null) {
-            daemon = new Bootstrap();
+            // Don't set daemon until init() has completed
+            Bootstrap bootstrap = new Bootstrap();
             try {
-                daemon.init();
+                bootstrap.init();
             } catch (Throwable t) {
                 t.printStackTrace();
                 return;
             }
+            daemon = bootstrap;
         }
 
         try {