[jbosstools-commits] JBoss Tools SVN: r41227 - in trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core: server/internal/v7 and 1 other directory.

[jbosstools-commits at lists.jboss.org]

Author: rob.stryker at jboss.com
Date: 2012-05-22 02:22:24 -0400 (Tue, 22 May 2012)
New Revision: 41227

Modified:
   trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/resolvers/ConfigNameResolver.java
   trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7Server.java
Log:
JBIDE-11887 

Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/resolvers/ConfigNameResolver.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/resolvers/ConfigNameResolver.java	2012-05-22 00:46:30 UTC (rev 41226)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/resolvers/ConfigNameResolver.java	2012-05-22 06:22:24 UTC (rev 41227)
@@ -142,8 +142,9 @@
 		IServer[] servers = ServerCore.getServers();
 		for( int i = 0; i < servers.length; i++ ) {
 			if( servers[i].getName().equals(serverOrRuntimeName)) {
-				return  (IJBossServerRuntime) servers[i].getRuntime()
-						.loadAdapter(IJBossServerRuntime.class, new NullProgressMonitor());
+				if( servers[i].getRuntime() != null )
+					return  (IJBossServerRuntime) servers[i].getRuntime()
+							.loadAdapter(IJBossServerRuntime.class, new NullProgressMonitor());
 			}
 		}
 		IRuntime[] runtimes = ServerCore.getRuntimes();

Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7Server.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7Server.java	2012-05-22 00:46:30 UTC (rev 41226)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7Server.java	2012-05-22 06:22:24 UTC (rev 41227)
@@ -68,6 +68,8 @@
 		if( type.equals(DEPLOY_SERVER) ) {
 			// TODO make sure this is correct?! Upstream APIs have this wrong for as7
 			IRuntime rt = getServer().getRuntime();
+			if( rt == null )
+				return null;
 			IPath p = rt.getLocation().append(AS7_STANDALONE).append(AS7_DEPLOYMENTS);
 			return ServerUtil.makeGlobal(rt, p).toString();
 		}