--- source-trees/wsrf-cvs/ws-gram/service/java/source/src/org/globus/exec/service/utils/DelegatedCredential.java	12 Aug 2005 00:36:39 -0000	1.34.2.1
+++ source-trees/wsrf-cvs/ws-gram/service/java/source/src/org/globus/exec/service/utils/DelegatedCredential.java	21 Apr 2008 13:57:37 -0000	1.34.2.2
@@ -16,16 +16,11 @@
 import java.io.InputStreamReader;
 import java.security.GeneralSecurityException;
 import java.util.Hashtable;
-import java.util.Iterator;
-
 import javax.security.auth.Subject;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-
 import org.apache.axis.message.MessageElement;
 import org.apache.axis.message.addressing.EndpointReferenceType;
-
 import org.globus.delegation.DelegationException;
 import org.globus.delegation.DelegationListener;
 import org.globus.delegation.DelegationUtil;
@@ -382,7 +377,7 @@
         throws                              GeneralSecurityException,
                                             IOException
     {
-        if ((this.userProxyFile == null) || !this.userProxyFile.exists()) {
+        if (this.userProxyFile == null) {
             if (logger.isDebugEnabled()) {
                 logger.debug("Ignoring job user proxy removal request.");
             }
@@ -459,7 +459,6 @@
             }
 
             Process proc = Runtime.getRuntime().exec(command);
-
             proc.getOutputStream().close();
 
             //handle possible sudo password prompt
@@ -478,11 +477,19 @@
                 }
             }
             stderr.close();
-
             proc.getInputStream().close();
-
         } else {
-            this.userProxyFile.delete();
+            if (this.userProxyFile.exists()) {
+                try {
+                    this.userProxyFile.delete();
+                } catch (Exception e) {
+                    logger.warn("Unable to delete user proxy file " +
+                        this.userProxyFile.getAbsolutePath(), e);
+                }
+            } else {
+                logger.debug("Can't delete user proxy file: " +
+                    this.userProxyFile.getAbsolutePath() + " does not exist");
+            }
         }
     }
 
--- source-trees/wsrf-cvs/ws-gram/service/java/source/pkgdata/pkg_data_src.gpt	23 Mar 2008 21:14:19 -0000	1.75.6.61
+++ source-trees/wsrf-cvs/ws-gram/service/java/source/pkgdata/pkg_data_src.gpt	21 Apr 2008 14:18:22 -0000	1.75.6.62
@@ -3,7 +3,7 @@
 
 <gpt_package_metadata Format_Version="0.01" Name="globus_wsrf_gram_service_java">
 
-  <Aging_Version Age="1" Major="1" Minor="20" />
+  <Aging_Version Age="1" Major="1" Minor="21" />
   <Description> GT4 Managed Job Service and Factory </Description>
   <Functional_Group>Execution</Functional_Group>
   <Version_Stability Release="alpha"/>