Author: rob.stryker(a)jboss.com Date: 2012-03-05 03:52:48 -0500 (Mon, 05 Mar 2012) New Revision: 39275 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServer.java Log: Method returning null when it shouldn't 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 2012-03-05 03:40:22 UTC (rev 39274) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServer.java 2012-03-05 08:52:48 UTC (rev 39275) @@ -128,9 +128,9 @@ ret = getCustomDeployLocationFromSettings(jbs.getServer(), DEPLOY_DIRECTORY); } if( ret == null || type.equals(DEPLOY_METADATA)) { - return getMetadataDeployLocation(jbs.getServer()); + ret = getMetadataDeployLocation(jbs.getServer()); } - return null; + return ret; } public static String getCustomDeployLocationFromSettings(IServer server, String attribute) {