OOZIE-2214 fix test case TestCoordRerunXCommand.testCoordRerunDateNeg (ryota)

egashira · egashira · commit 6aefbc710d28 · 2015-04-24T17:42:08.000-07:00
diff --git a/core/src/main/java/org/apache/oozie/coord/CoordUtils.java b/core/src/main/java/org/apache/oozie/coord/CoordUtils.java
@@ -143,9 +143,7 @@ public static List<CoordinatorActionBean> getCoordActionsFromDates(String jobId,
                     if (e.getErrorCode() == ErrorCode.E0605) {
                         XLog.getLog(CoordUtils.class).info("No action for nominal time:" + s + ". Skipping over");
                     }
-                    else {
-                        throw new CommandException(e);
-                    }
+                    throw new CommandException(e);
                 }
 
             }
diff --git a/release-log.txt b/release-log.txt
@@ -1,5 +1,6 @@
 -- Oozie 4.2.0 release (trunk - unreleased)
 
+OOZIE-2214 fix test case TestCoordRerunXCommand.testCoordRerunDateNeg (ryota)
 OOZIE-2213 oozie-setup.ps1 should use "start-process" rather than "cmd /c" to invoke OozieSharelibCLI or OozieDBCLI commands (bzhang)
 OOZIE-2210 Update extjs 2.2 link (bzhang)
 OOZIE-2205 add option to load default/site.xml to actionConf on compute node (ryota)

Original file line number	Diff line number	Diff line change
`@@ -143,9 +143,7 @@ public static List<CoordinatorActionBean> getCoordActionsFromDates(String jobId,`
`143`	`143`	`if (e.getErrorCode() == ErrorCode.E0605) {`
`144`	`144`	`XLog.getLog(CoordUtils.class).info("No action for nominal time:" + s + ". Skipping over");`
`145`	`145`	`}`
`146`		`- else {`
`147`		`- throw new CommandException(e);`
`148`		`- }`
	`146`	`+ throw new CommandException(e);`
`149`	`147`	`}`
`150`	`148`
`151`	`149`	`}`