svn commit: r1173914 - /karaf/trunk/main/src/main/java/org/apache/karaf/main/Main.java

[djencks]

Author: djencks
Date: Wed Sep 21 23:58:46 2011
New Revision: 1173914

URL: http://svn.apache.org/viewvc?rev=1173914&view=rev
Log:
try to avoid an npe for early start failures

Modified:
    karaf/trunk/main/src/main/java/org/apache/karaf/main/Main.java

Modified: karaf/trunk/main/src/main/java/org/apache/karaf/main/Main.java
URL: 
http://svn.apache.org/viewvc/karaf/trunk/main/src/main/java/org/apache/karaf/main/Main.java?rev=1173914&r1=1173913&r2=1173914&view=diff
==============================================================================
--- karaf/trunk/main/src/main/java/org/apache/karaf/main/Main.java (original)
+++ karaf/trunk/main/src/main/java/org/apache/karaf/main/Main.java Wed Sep 21 
23:58:46 2011
@@ -469,8 +469,10 @@ public class Main {
                        try {
                                manager = main.launch();
                        } catch (Throwable ex) {
-                               main.lifecycleManager.destroyKaraf();
-                               exitCode = -1;
+                if (main.lifecycleManager != null) {
+                    main.lifecycleManager.destroyKaraf();
+                }
+                exitCode = -1;
                                System.err.println("Could not create framework: 
" + ex);
                                ex.printStackTrace();
                        }