File: fixDrmmato6.2

package info (click to toggle)
logol 1.7.0-2
  • links: PTS, VCS
  • area: main
  • in suites: jessie, jessie-kfreebsd
  • size: 4,660 kB
  • ctags: 1,144
  • sloc: java: 10,613; perl: 2,651; ansic: 362; xml: 322; ruby: 280; sh: 115; makefile: 35
file content (34 lines) | stat: -rw-r--r-- 1,724 bytes parent folder | download | duplicates (2)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
Subject: DRMAA API change between 6.1 and 6.2
Description: Debian DRMAA is v6.2, API need an update
Author: Olivier Sallou <osallou@debian.org>
Last-Updated: 2012-06-18
Forwarded: no
--- a/src/org/irisa/genouest/logol/dispatcher/SGEJobManager.java
+++ b/src/org/irisa/genouest/logol/dispatcher/SGEJobManager.java
@@ -10,6 +10,7 @@
 import org.ggf.drmaa.Session;
 import org.ggf.drmaa.SessionFactory;
 import org.irisa.genouest.logol.Constants;
+import java.util.Arrays;
 
 /*
  * Manage the submission of jobs on a SGE system using DRMAA Java library.
@@ -80,11 +81,16 @@
 		    jt.setOutputPath(":" + out+".out");		
 			jt.setErrorPath(":" + out + ".err");
 			if(OS.startsWith("win")) {
-				jt.setArgs(new String[] {installPath + System.getProperty(Constants.FILESEPARATORPROPERTY)+ "LogolExec.rb", arguments,jobsArgs.get(i)," -output "+jobsOutput.get(i)});
+				//jt.setArgs(new String[] {installPath + System.getProperty(Constants.FILESEPARATORPROPERTY)+ "LogolExec.rb", arguments,jobsArgs.get(i)," -output "+jobsOutput.get(i)});
+				String[] tmpargs = new String[] {arguments,jobsArgs.get(i)," -output "+jobsOutput.get(i)};
+				jt.setArgs(Arrays.asList(tmpargs));
 			    jt.setRemoteCommand("ruby");				
 			}
 			else {
-				jt.setArgs(new String[] {arguments,jobsArgs.get(i)," -output "+jobsOutput.get(i)});
+				//jt.setArgs(new String[] {arguments,jobsArgs.get(i)," -output "+jobsOutput.get(i)});
+				String[] tmpargs = new String[] {arguments,jobsArgs.get(i)," -output "+jobsOutput.get(i)};
+				jt.setArgs(Arrays.asList(tmpargs));
+
 				jt.setRemoteCommand(installPath + System.getProperty(Constants.FILESEPARATORPROPERTY)+ "LogolExec.sh");
 			}
 		    jobId = session.runJob(jt);