[jbosstools-commits] JBoss Tools SVN: r39643 - in trunk/as/plugins: org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui and 1 other directory.

[jbosstools-commits at lists.jboss.org]

Author: rob.stryker at jboss.com
Date: 2012-03-20 03:25:11 -0400 (Tue, 20 Mar 2012)
New Revision: 39643

Modified:
   trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEPublishMethod.java
   trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEUtils.java
   trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEDeploymentPreferenceUI.java
Log:
JBIDE-11351 - clean up npe's

Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEPublishMethod.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEPublishMethod.java	2012-03-19 20:18:37 UTC (rev 39642)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEPublishMethod.java	2012-03-20 07:25:11 UTC (rev 39643)
@@ -181,14 +181,15 @@
 		Trace.trace(Trace.STRING_FINER, "Loading remote deployment details for server " + getServer().getName());
 		String connectionName = RSEUtils.getRSEConnectionName(behaviour.getServer());
 		IDeployableServer ds = ServerConverter.getDeployableServer(behaviour.getServer());
-		this.remoteRootFolder = new Path(RSEUtils.getDeployRootFolder(ds));
+		String deployRoot = RSEUtils.getDeployRootFolder(ds);
+		if( deployRoot == null )
+			throw new CoreException(new Status(IStatus.ERROR, org.jboss.ide.eclipse.as.rse.core.RSECorePlugin.PLUGIN_ID, "Server has null deploy root folder. This may be caused by a missing runtime, or improperly configured server adapter"));
+		this.remoteRootFolder = new Path(deployRoot);
 		
 		IHost host = RSEUtils.findHost(connectionName);
-		if( host != null ) {
-			fileSubSystem = findFileTransferSubSystem(host);
-		} else {
+		if( host == null )
 			throw new CoreException(new Status(IStatus.ERROR, org.jboss.ide.eclipse.as.rse.core.RSECorePlugin.PLUGIN_ID, "RSE Host Not Found."));
-		}
+		fileSubSystem = findFileTransferSubSystem(host);
 	}
 	
 	/*  approved files subsystems *

Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEUtils.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEUtils.java	2012-03-19 20:18:37 UTC (rev 39642)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEUtils.java	2012-03-20 07:25:11 UTC (rev 39643)
@@ -72,7 +72,8 @@
 
 	public static String getRSEConfigName(IServerAttributes server) {
 		IJBossServerRuntime runtime = RuntimeUtils.getJBossServerRuntime(server);
-		return server.getAttribute(RSEUtils.RSE_SERVER_CONFIG, runtime.getJBossConfiguration());
+		return server.getAttribute(RSEUtils.RSE_SERVER_CONFIG, 
+				runtime == null ? null : runtime.getJBossConfiguration());
 	}
 
 	public static String getDeployRootFolder(IDeployableServer server) {
@@ -107,6 +108,8 @@
 			} else {
 				String loc = IConstants.SERVER;
 				String config = getRSEConfigName(server);
+				if( loc == null || config == null )
+					return null;
 				IPath p = new Path(loc).append(config)
 						.append(IJBossRuntimeResourceConstants.DEPLOY);
 				return makeGlobal(server, p).toString();

Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEDeploymentPreferenceUI.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEDeploymentPreferenceUI.java	2012-03-19 20:18:37 UTC (rev 39642)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEDeploymentPreferenceUI.java	2012-03-20 07:25:11 UTC (rev 39643)
@@ -89,7 +89,8 @@
 		ExploreActionProvider.exploreBehaviorMap.put("rse", new ExploreActionProvider.IExploreBehavior() {
 			public void openExplorer(IServer server, IModule[] module) {
 				IDeployableServer ds = ServerConverter.getDeployableServer(server);
-				IPath remoteFolder = new Path(RSEUtils.getDeployRootFolder(ds));
+				String remote = RSEUtils.getDeployRootFolder(ds);
+				IPath remoteFolder = new Path(remote == null ? "/" : remote);
 				IJBossServerPublishMethodType type = DeploymentPreferenceLoader.getCurrentDeploymentMethodType(server);
 				RSEPublishMethod method = (RSEPublishMethod)type.createPublishMethod();
 				method.setBehaviour(ServerConverter.getDeployableServerBehavior(server));