[addressing-devel] FuraSrc/Server/Plugins/ShellPlugin/plugin/src/com/gridsystems/shellexecutor/internal/api ApiShellExecutorImpl.java, 1.2, 1.3 AssignmentLogger.java, 1.1, 1.2 AssignmentProcessor.java, 1.1, 1.2

[Gridsystems C. <gsc...@us...>]

Update of /cvsroot/fura/FuraSrc/Server/Plugins/ShellPlugin/plugin/src/com/gridsystems/shellexecutor/internal/api
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv8372/FuraSrc/Server/Plugins/ShellPlugin/plugin/src/com/gridsystems/shellexecutor/internal/api

Modified Files:
	ApiShellExecutorImpl.java AssignmentLogger.java 
	AssignmentProcessor.java 
Log Message:
cvssync-20080903232636

Index: ApiShellExecutorImpl.java
===================================================================
RCS file: /cvsroot/fura/FuraSrc/Server/Plugins/ShellPlugin/plugin/src/com/gridsystems/shellexecutor/internal/api/ApiShellExecutorImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ApiShellExecutorImpl.java	22 Aug 2008 22:16:16 -0000	1.2
--- ApiShellExecutorImpl.java	3 Sep 2008 21:27:22 -0000	1.3
***************
*** 118,124 ****
      for (int i = 0; i < array.length; i++) {
        try {
!         AssignmentStatus as = array[i].getAssignStatus();
          if (as.getResourceId().equals(resourceId)) {
!           assignStatus.add((AssignmentStatus)as.clone());
          }
        } catch (CloneNotSupportedException e) {
--- 118,128 ----
      for (int i = 0; i < array.length; i++) {
        try {
!         AssignmentStatus as = (AssignmentStatus)array[i].getAssignStatus().clone();
          if (as.getResourceId().equals(resourceId)) {
!           AssignmentStatus asClone = (AssignmentStatus)as.clone();
!           if (as.getStatus() == AssignmentStatus.STATUS_FINISHED) {
!             continue;
!           }
!           assignStatus.add(asClone);
          }
        } catch (CloneNotSupportedException e) {

Index: AssignmentLogger.java
===================================================================
RCS file: /cvsroot/fura/FuraSrc/Server/Plugins/ShellPlugin/plugin/src/com/gridsystems/shellexecutor/internal/api/AssignmentLogger.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** AssignmentLogger.java	16 Jul 2008 06:55:56 -0000	1.1
--- AssignmentLogger.java	3 Sep 2008 21:27:22 -0000	1.2
***************
*** 27,31 ****
  
  import com.gridsystems.resource.api.ResourceAssignment;
- import com.gridsystems.shellexecutor.internal.config.ShellExecutorConfiguration;
  
  /**
--- 27,30 ----
***************
*** 58,71 ****
  
    /**
-    * Is enabled.
-    */
-   public final boolean isEnabled;
- 
-   /**
     * @param startTime Start time.
     */
    public AssignmentLogger(long startTime) {
      this.lastTime = startTime;
-     this.isEnabled = ShellExecutorConfiguration.isEnabledDebugMode();
    }
  
--- 57,64 ----
***************
*** 108,115 ****
      stb.append(ShellExecutorUtils.DATEFORMAT.format(new Date()));
      stb.append(" ").append(msgLog).append(SEP);
- 
-     Logger theLog = Logger.getLogger(this.getClass());
-     theLog.error(SEP + msgLog + SEP);
- 
      str.append(stb.toString());
    }
--- 101,104 ----

Index: AssignmentProcessor.java
===================================================================
RCS file: /cvsroot/fura/FuraSrc/Server/Plugins/ShellPlugin/plugin/src/com/gridsystems/shellexecutor/internal/api/AssignmentProcessor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** AssignmentProcessor.java	16 Jul 2008 06:55:56 -0000	1.1
--- AssignmentProcessor.java	3 Sep 2008 21:27:22 -0000	1.2
***************
*** 744,747 ****
--- 744,750 ----
      }
      if (this.executionType == ShellAssignment.EXECUTION_TYPE_JAVA) {
+       if (index >= commandParams.length) {
+         index = commandParams.length - 1;
+       }
        // Exclude null values.
        if (commandParams[index] == null) {