Index: mbeanapi-impl/src/java/com/sun/enterprise/management/deploy/DeployThread.java
===================================================================
RCS file: /cvs/glassfish/admin/mbeanapi-impl/src/java/com/sun/enterprise/management/deploy/DeployThread.java,v
retrieving revision 1.11.6.1
diff -u -p -r1.11.6.1 DeployThread.java
--- mbeanapi-impl/src/java/com/sun/enterprise/management/deploy/DeployThread.java	4 Sep 2008 21:20:08 -0000	1.11.6.1
+++ mbeanapi-impl/src/java/com/sun/enterprise/management/deploy/DeployThread.java	18 Feb 2009 15:20:01 -0000
@@ -37,12 +37,9 @@
 package com.sun.enterprise.management.deploy;
 
 import java.io.File;
-import java.io.IOException;
-import java.util.Collections;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.Properties;
 import java.util.logging.Logger;
 
 import java.io.Serializable;
@@ -221,12 +218,12 @@ public final class DeployThread extends 
             throw new IllegalArgumentException( "no params specified" );
         }
                
-	trace( "DeployThread.run: calling deploy() for: " + getID() );
-	mDeploymentStatus = deploy( mParams, mDeploymentCallback );
-	trace( "DeployThread.run: deploy() successful for: " + getID()  );
+            trace("DeployThread.run: calling deploy() for: " + getID());
+            mDeploymentStatus = deploy(mParams, mDeploymentCallback);
+            trace("DeployThread.run: deploy() successful for: " + getID());
+
+            mDeploymentCallback.deploymentDone(mDeploymentStatus);
 
-	mDeploymentCallback.deploymentDone( mDeploymentStatus );
-		
 	// success or failure, always kill the file
 	if ( mParams.getDeployFile() != null ) {
 	    trace( "DeployThread.run: deleting deploy file: " + mParams.getDeployFile() );
@@ -238,6 +235,18 @@ public final class DeployThread extends 
 	    trace( "DeployThread.run: deleting plan file: " + mParams.getPlanFile() );
 	    mParams.getPlanFile().delete();
 	}
+
+    // success or failure, always kill the file
+    if (mParams.getDeploymentSource() != null) {
+        trace("DeployThread.run: deleting source archive file: " + mParams.getDeploymentSource().getArchive());
+        mParams.getDeploymentSource().getArchive().delete();
+    }
+
+    // success or failure, always kill the file
+    if (mParams.getDeploymentPlan() != null) {
+        trace("DeployThread.run: deleting source plan file: " + mParams.getDeploymentPlan().getArchive());
+        mParams.getDeploymentPlan().getArchive().delete();
+    }
 		
 	mDoneMillis	= System.currentTimeMillis();
 	mDone	= true;