From c4d7ecfc60ca714aefb1cc2331325d9fc6fe5884 Mon Sep 17 00:00:00 2001
From: Doug Schaefer <cdtdoug@gmail.com>
Date: Tue, 24 May 2016 10:47:12 -0400
Subject: [PATCH] Bug 494427 - fix NPE in launch active.

Change-Id: I97e150b2c457702208b714dd7870955dc9e70067
---
 .../commands/LaunchActiveCommandHandler.java      |  7 ++++++-
 pom.xml                                           | 15 ---------------
 2 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/bundles/org.eclipse.launchbar.ui/src/org/eclipse/launchbar/ui/internal/commands/LaunchActiveCommandHandler.java b/bundles/org.eclipse.launchbar.ui/src/org/eclipse/launchbar/ui/internal/commands/LaunchActiveCommandHandler.java
index 45ff856928e..f7aa548a5d5 100644
--- a/bundles/org.eclipse.launchbar.ui/src/org/eclipse/launchbar/ui/internal/commands/LaunchActiveCommandHandler.java
+++ b/bundles/org.eclipse.launchbar.ui/src/org/eclipse/launchbar/ui/internal/commands/LaunchActiveCommandHandler.java
@@ -29,9 +29,14 @@ public class LaunchActiveCommandHandler extends AbstractHandler {
 			ILaunchBarManager launchBarManager = Activator.getService(ILaunchBarManager.class);
 			StopActiveCommandHandler.stopActiveLaunches(launchBarManager);
 			ILaunchConfiguration config = launchBarManager.getActiveLaunchConfiguration();
-			if (config == null)
+			if (config == null) {
 				return Status.OK_STATUS;
+			}
+
 			ILaunchMode launchMode = launchBarManager.getActiveLaunchMode();
+			if (launchMode == null) {
+				return Status.OK_STATUS;
+			}
 			DebugUITools.launch(config, launchMode.getIdentifier());
 
 			return Status.OK_STATUS;
diff --git a/pom.xml b/pom.xml
index cb4bf1ac8a9..a2deaa55320 100644
--- a/pom.xml
+++ b/pom.xml
@@ -219,11 +219,6 @@
 							<ws>gtk</ws>
 							<arch>x86_64</arch>
 						</environment>
-						<environment>
-							<os>linux</os>
-							<ws>gtk</ws>
-							<arch>ppc64</arch>
-						</environment>
 						<environment>
 							<os>win32</os>
 							<ws>win32</ws>
@@ -239,16 +234,6 @@
 							<ws>cocoa</ws>
 							<arch>x86_64</arch>
 						</environment>
-						<environment>
-							<os>aix</os>
-							<ws>gtk</ws>
-							<arch>ppc</arch>
-						</environment>
-						<environment>
-							<os>solaris</os>
-							<ws>gtk</ws>
-							<arch>sparc</arch>
-						</environment>
 					</environments>
 				</configuration>
 			</plugin>