[jbosstools-commits] JBoss Tools SVN: r43949 - in trunk: runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui and 1 other directory.

[jbosstools-commits at lists.jboss.org]

Author: snjeza
Date: 2012-09-23 05:06:48 -0400 (Sun, 23 Sep 2012)
New Revision: 43949

Modified:
   trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUIPlugin.java
   trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/RuntimeWorkbenchUtils.java
Log:
JBIDE-12665 - org.jboss.ide.eclipse.as.management.as7.tests: An unexpected error occured (return code 13)

Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUIPlugin.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUIPlugin.java	2012-09-22 14:15:24 UTC (rev 43948)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUIPlugin.java	2012-09-23 09:06:48 UTC (rev 43949)
@@ -18,6 +18,7 @@
 import org.eclipse.core.runtime.Status;
 import org.eclipse.ui.IDecoratorManager;
 import org.eclipse.ui.IStartup;
+import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.internal.WorkbenchPlugin;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.eclipse.wst.server.core.ServerCore;
@@ -94,7 +95,9 @@
 		ServerCore.removeServerLifecycleListener(selectionProvider);
 		UnitedServerListenerManager.getDefault().removeListener(ShowConsoleServerStateListener.getDefault());
 		UnitedServerListenerManager.getDefault().removeListener(as7ScannerAssist);
-		JBossServerUISharedImages.instance().cleanup();
+		if (PlatformUI.isWorkbenchRunning()) {
+			JBossServerUISharedImages.instance().cleanup();
+		}
 		super.stop(context);
 	}
 

Modified: trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/RuntimeWorkbenchUtils.java
===================================================================
--- trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/RuntimeWorkbenchUtils.java	2012-09-22 14:15:24 UTC (rev 43948)
+++ trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/RuntimeWorkbenchUtils.java	2012-09-23 09:06:48 UTC (rev 43949)
@@ -12,6 +12,9 @@
 public class RuntimeWorkbenchUtils {
 	public static void refreshServersView() {
 		// https://jira.jboss.org/jira/browse/JBDS-1091
+		if (!PlatformUI.isWorkbenchRunning()) {
+			return;
+		}
 		Display.getDefault().asyncExec(new Runnable() {
 			public void run() {
 				IViewPart view = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().findView("org.eclipse.wst.server.ui.ServersView");