Author: rob.stryker(a)jboss.com Date: 2010-02-12 02:50:37 -0500 (Fri, 12 Feb 2010) New Revision: 20261 Modified: branches/jbosstools-3.1.0.RC2/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServer.java Log: JBDS-1094 partial fix from what I could replicate committed to cr2 branch Modified: branches/jbosstools-3.1.0.RC2/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServer.java =================================================================== --- branches/jbosstools-3.1.0.RC2/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServer.java 2010-02-12 07:46:50 UTC (rev 20260) +++ branches/jbosstools-3.1.0.RC2/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServer.java 2010-02-12 07:50:37 UTC (rev 20261) @@ -145,8 +145,15 @@ public static String getDeployFolder(JBossServer jbs, String type) { IServer server = jbs.getServer(); IJBossServerRuntime jbsrt = getRuntime(server); - if( type.equals(DEPLOY_CUSTOM)) - return ServerUtil.makeGlobal(jbsrt, new Path(jbs.getAttribute(DEPLOY_DIRECTORY, ""))).toString(); //$NON-NLS-1$ + if( type.equals(DEPLOY_CUSTOM)) { + String val = jbs.getAttribute(DEPLOY_DIRECTORY, (String)null); + if( val != null ) { + IPath val2 = new Path(val); + return ServerUtil.makeGlobal(jbsrt, val2).toString(); + } + // if no value is set, default to metadata + type = DEPLOY_METADATA; + } if( type.equals(DEPLOY_METADATA)) { return JBossServerCorePlugin.getServerStateLocation(server). append(IJBossServerConstants.DEPLOY).makeAbsolute().toString();