Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Phillips2014-01-10 20:23:10 +0000
committerRoberto E. Escobar2014-01-13 18:51:34 +0000
commitaebc40830fde4ba135b00945fb01a38c34dcf994 (patch)
treecf021ce90699ec97809c1a86da4096125013784a
parent3d2cf72bdca98363bc0fa8884e4b01e86835f08e (diff)
downloadorg.eclipse.osee-aebc40830fde4ba135b00945fb01a38c34dcf994.tar.gz
org.eclipse.osee-aebc40830fde4ba135b00945fb01a38c34dcf994.tar.xz
org.eclipse.osee-aebc40830fde4ba135b00945fb01a38c34dcf994.zip
bug: Prevent NPE in OteServer
-rw-r--r--plugins/org.eclipse.osee.ote.server/src/org/eclipse/osee/ote/server/internal/OteService.java8
1 files changed, 6 insertions, 2 deletions
diff --git a/plugins/org.eclipse.osee.ote.server/src/org/eclipse/osee/ote/server/internal/OteService.java b/plugins/org.eclipse.osee.ote.server/src/org/eclipse/osee/ote/server/internal/OteService.java
index 1559fc24202..3b7d2c36636 100644
--- a/plugins/org.eclipse.osee.ote.server/src/org/eclipse/osee/ote/server/internal/OteService.java
+++ b/plugins/org.eclipse.osee.ote.server/src/org/eclipse/osee/ote/server/internal/OteService.java
@@ -157,12 +157,16 @@ public class OteService implements IHostTestEnvironment, IService {
@Override
public void kill() throws RemoteException {
- currentEnvironment.shutdown();
+ if (currentEnvironment != null) {
+ currentEnvironment.shutdown();
+ }
}
@Override
public void cleanupRuntimeBundles() throws RemoteException {
- runtimeLibraryManager.cleanup();
+ if (runtimeLibraryManager != null) {
+ runtimeLibraryManager.cleanup();
+ }
}
@Override

Back to the top