Author: hasan
Date: Mon May 23 07:55:20 2011
New Revision: 1126365

URL: http://svn.apache.org/viewvc?rev=1126365&view=rev
Log:
CLEREZZA-534: avoided calling method of a not instantiated felixInstance

Modified:
    
incubator/clerezza/trunk/parent/platform.launcher.storageless.parent/platform.launcher.storageless/src/main/java/org/apache/clerezza/platform/launcher/ClerezzaApp.java

Modified: 
incubator/clerezza/trunk/parent/platform.launcher.storageless.parent/platform.launcher.storageless/src/main/java/org/apache/clerezza/platform/launcher/ClerezzaApp.java
URL: 
http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/platform.launcher.storageless.parent/platform.launcher.storageless/src/main/java/org/apache/clerezza/platform/launcher/ClerezzaApp.java?rev=1126365&r1=1126364&r2=1126365&view=diff
==============================================================================
--- 
incubator/clerezza/trunk/parent/platform.launcher.storageless.parent/platform.launcher.storageless/src/main/java/org/apache/clerezza/platform/launcher/ClerezzaApp.java
 (original)
+++ 
incubator/clerezza/trunk/parent/platform.launcher.storageless.parent/platform.launcher.storageless/src/main/java/org/apache/clerezza/platform/launcher/ClerezzaApp.java
 Mon May 23 07:55:20 2011
@@ -205,7 +205,9 @@ public class ClerezzaApp {
        public void waitForStop() throws Throwable {
                FrameworkEvent event = null;
                try {
-                       event = felixInstance.waitForStop(0);
+                       if (felixInstance != null) {
+                               event = felixInstance.waitForStop(0);
+                       }
                        setExitCode(0);
                } catch (Throwable t) {
                        setExitCode(-1);


Reply via email to