Author: rob.stryker(a)jboss.com Date: 2012-09-20 02:37:55 -0400 (Thu, 20 Sep 2012) New Revision: 43848 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/AbstractServerToolsPublisher.java trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/core/util/LocalCopyCallback.java Log: JBIDE-12101 ensuring a removal for temp files Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/AbstractServerToolsPublisher.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/AbstractServerToolsPublisher.java 2012-09-20 00:22:54 UTC (rev 43847) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/AbstractServerToolsPublisher.java 2012-09-20 06:37:55 UTC (rev 43848) @@ -124,7 +124,7 @@ } protected IPath getTempDeployPath(IModule[] moduleTree, IDeployableServer server) { - return server.getTempDeploymentLocation(moduleTree, true); + return server.getTempDeploymentLocation(moduleTree, false); } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/core/util/LocalCopyCallback.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/core/util/LocalCopyCallback.java 2012-09-20 00:22:54 UTC (rev 43847) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/core/util/LocalCopyCallback.java 2012-09-20 06:37:55 UTC (rev 43848) @@ -206,18 +206,19 @@ } protected File getTempFolder() { + if( tmpDeployRootFolder == null && server == null ) + return tempDir; File f = null; if( tmpDeployRootFolder != null ) { - f = tmpDeployRootFolder.toFile(); - } else if( server == null ) { - return tempDir; - } - IDeployableServer ds = ServerConverter.getDeployableServer(server); - if( ds == null ) { - return tempDir; + f = tmpDeployRootFolder.toFile(); + } else /* if server != null */{ + IDeployableServer ds = ServerConverter.getDeployableServer(server); + if( ds == null ) { + return tempDir; + } + String path = ds.getTempDeployFolder(); + f = new File(path); } - String path = ds.getTempDeployFolder(); - f = new File(path); if( !f.exists() ) f.mkdirs(); return f;