Author: rob.stryker(a)jboss.com
Date: 2010-02-12 02:19:53 -0500 (Fri, 12 Feb 2010)
New Revision: 20258
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServer.java
Log:
JBDS-1094 - fix regarding 'custom' being set to just the runtime location if
unset.
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServer.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServer.java 2010-02-12
06:09:39 UTC (rev 20257)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServer.java 2010-02-12
07:19:53 UTC (rev 20258)
@@ -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();
Show replies by date