[Cogkit-svn] SF.net SVN: cogkit: [994] trunk/current/src/cog/modules/provider-gt4_0_0

[<ha...@us...>]

Revision: 994
          http://svn.sourceforge.net/cogkit/?rev=994&view=rev
Author:   hategan
Date:     2006-10-18 07:30:36 -0700 (Wed, 18 Oct 2006)

Log Message:
-----------
tasks have an initial non-null status

Modified Paths:
--------------
    trunk/current/src/cog/modules/provider-gt4_0_0/CHANGES.txt
    trunk/current/src/cog/modules/provider-gt4_0_0/src/org/globus/cog/abstraction/impl/execution/gt4_0_0/JobSubmissionTaskHandler.java

Modified: trunk/current/src/cog/modules/provider-gt4_0_0/CHANGES.txt
===================================================================
--- trunk/current/src/cog/modules/provider-gt4_0_0/CHANGES.txt	2006-10-18 03:29:13 UTC (rev 993)
+++ trunk/current/src/cog/modules/provider-gt4_0_0/CHANGES.txt	2006-10-18 14:30:36 UTC (rev 994)
@@ -1,3 +1,9 @@
+(10/18/2006)
+
+*** Attempt to fix handling of status notifications. There is some
+	oddness in jobs having no initial status (which could cause
+	NPEs on anything that would query details of the status)
+
 (04/12/2006)    Use the new spec.isDelegationEnabled()
                 Fixed boot crash when no ip set in cog.properties
 				Some cleanups

Modified: trunk/current/src/cog/modules/provider-gt4_0_0/src/org/globus/cog/abstraction/impl/execution/gt4_0_0/JobSubmissionTaskHandler.java
===================================================================
--- trunk/current/src/cog/modules/provider-gt4_0_0/src/org/globus/cog/abstraction/impl/execution/gt4_0_0/JobSubmissionTaskHandler.java	2006-10-18 03:29:13 UTC (rev 993)
+++ trunk/current/src/cog/modules/provider-gt4_0_0/src/org/globus/cog/abstraction/impl/execution/gt4_0_0/JobSubmissionTaskHandler.java	2006-10-18 14:30:36 UTC (rev 994)
@@ -11,7 +11,6 @@
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
-import java.util.Vector;
 
 import org.apache.axis.components.uuid.UUIDGenFactory;
 import org.apache.axis.message.addressing.EndpointReferenceType;
@@ -252,8 +251,7 @@
 			desc.setQueue((String) spec.getAttribute("queue"));
 		}
 
-		Vector v = spec.getArgumentsAsVector();
-		desc.setArgument((String[]) v.toArray(new String[0]));
+		desc.setArgument((String[]) spec.getArgumentsAsList().toArray(new String[0]));
 
 		boolean batchJob = spec.isBatchJob();
 		if (spec.isRedirected()) {
@@ -277,7 +275,7 @@
 		}
 		desc.setExecutable(spec.getExecutable());
 
-		Collection environment = spec.getEnvironment();
+		Collection environment = spec.getEnvironmentVariableNames();
 		if (environment != null && environment.size() > 0) {
 			NameValuePairType[] envVars = new NameValuePairType[environment.size()];
 			Iterator iterator = environment.iterator();
@@ -304,8 +302,13 @@
 			newStatus.setPrevStatusCode(oldStatus.getStatusCode());
 			newStatus.setStatusCode(Status.FAILED);
 			int errorCode = job.getError();
-			newStatus.setMessage("#" + errorCode + " " + job.getFault().getDescription()[0]);
-			newStatus.setException((Exception) job.getFault().getCause());
+			if (job.getFault() != null) {
+				newStatus.setMessage("#" + errorCode + " " + job.getFault().getDescription()[0]);
+				newStatus.setException((Exception) job.getFault().getCause());
+			}
+			else {
+				newStatus.setMessage("#" + errorCode);
+			}
 			this.task.setStatus(newStatus);
 			cleanup();
 		}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.