svn commit: r1541966 - in /oozie/trunk: ./ core/src/main/java/org/apache/oozie/command/coord/ core/src/test/java/org/apache/oozie/command/coord/

[virag]

Author: virag
Date: Thu Nov 14 16:35:21 2013
New Revision: 1541966

URL: http://svn.apache.org/r1541966
Log:
OOZIE-1314 IllegalArgumentException: wfId cannot be empty (shwethags via virag)

Modified:
    
oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordRerunXCommand.java
    
oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordSubmitXCommand.java
    
oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordRerunXCommand.java
    oozie/trunk/release-log.txt

Modified: 
oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordRerunXCommand.java
URL: 
http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordRerunXCommand.java?rev=1541966&r1=1541965&r2=1541966&view=diff
==============================================================================
--- 
oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordRerunXCommand.java
 (original)
+++ 
oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordRerunXCommand.java
 Thu Nov 14 16:35:21 2013
@@ -197,8 +197,8 @@ public class CoordRerunXCommand extends 
             coordAction.setCreatedTime(new Date());
         }
         coordAction.setStatus(CoordinatorAction.Status.WAITING);
-        coordAction.setExternalId("");
-        coordAction.setExternalStatus("");
+        coordAction.setExternalId(null);
+        coordAction.setExternalStatus(null);
         coordAction.setRerunTime(new Date());
         coordAction.setLastModifiedTime(new Date());
         updateList.add(new 
UpdateEntry<CoordActionQuery>(CoordActionQuery.UPDATE_COORD_ACTION_RERUN, 
coordAction));

Modified: 
oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordSubmitXCommand.java
URL: 
http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordSubmitXCommand.java?rev=1541966&r1=1541965&r2=1541966&view=diff
==============================================================================
--- 
oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordSubmitXCommand.java
 (original)
+++ 
oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordSubmitXCommand.java
 Thu Nov 14 16:35:21 2013
@@ -782,7 +782,7 @@ public class CoordSubmitXCommand extends
     /**
      * Resolve input-events/data-in and output-events/data-out tags.
      *
-     * @param eJob : Job element
+     * @param eJobOrg : Job element
      * @throws CoordinatorJobException thrown if failed to resolve input and 
output events
      */
     @SuppressWarnings("unchecked")

Modified: 
oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordRerunXCommand.java
URL: 
http://svn.apache.org/viewvc/oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordRerunXCommand.java?rev=1541966&r1=1541965&r2=1541966&view=diff
==============================================================================
--- 
oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordRerunXCommand.java
 (original)
+++ 
oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordRerunXCommand.java
 Thu Nov 14 16:35:21 2013
@@ -121,6 +121,7 @@ public class TestCoordRerunXCommand exte
         store2.beginTrx();
         CoordinatorActionBean action2 = store2.getCoordinatorAction(actionId, 
false);
         assertNotSame(action2.getStatus(), CoordinatorAction.Status.SUCCEEDED);
+        assertNull(action2.getExternalId());
         store2.commitTrx();
         store2.closeTrx();
     }

Modified: oozie/trunk/release-log.txt
URL: 
http://svn.apache.org/viewvc/oozie/trunk/release-log.txt?rev=1541966&r1=1541965&r2=1541966&view=diff
==============================================================================
--- oozie/trunk/release-log.txt (original)
+++ oozie/trunk/release-log.txt Thu Nov 14 16:35:21 2013
@@ -1,5 +1,6 @@
 -- Oozie 4.1.0 release (trunk - unreleased)
 
+OOZIE-1314 IllegalArgumentException: wfId cannot be empty (shwethags via virag)
 OOZIE-1606 Update Curator to 2.3.0 and fix some misc minor ZK related things 
(rkanter)
 OOZIE-1544 Support variables for coord data-in/data-out dataset (puru via 
rohini)
 OOZIE-1603 cannot submit job to oozie on mysql (virag)