Author: rkanter
Date: Tue Jul 16 16:32:13 2013
New Revision: 1503786
URL: http://svn.apache.org/r1503786
Log:
OOZIE-1453 Change frequency to string in SyncCoordAction.java (bowenzhangusa
via rkanter)
Modified:
oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordCommandUtils.java
oozie/trunk/core/src/main/java/org/apache/oozie/coord/CoordELEvaluator.java
oozie/trunk/core/src/main/java/org/apache/oozie/coord/SyncCoordAction.java
oozie/trunk/release-log.txt
Modified:
oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordCommandUtils.java
URL:
http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordCommandUtils.java?rev=1503786&r1=1503785&r2=1503786&view=diff
==============================================================================
---
oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordCommandUtils.java
(original)
+++
oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordCommandUtils.java
Tue Jul 16 16:32:13 2013
@@ -424,7 +424,7 @@ public class CoordCommandUtils {
appInst.setName(eAction.getAttributeValue("name"));
appInst.setNominalTime(nominalTime);
appInst.setActualTime(actualTime);
- int frequency =
Integer.parseInt(eAction.getAttributeValue("frequency"));
+ String frequency = eAction.getAttributeValue("frequency");
appInst.setFrequency(frequency);
appInst.setTimeUnit(TimeUnit.valueOf(eAction.getAttributeValue("freq_timeunit")));
appInst.setTimeZone(DateUtils.getTimeZone(eAction.getAttributeValue("timezone")));
Modified:
oozie/trunk/core/src/main/java/org/apache/oozie/coord/CoordELEvaluator.java
URL:
http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/coord/CoordELEvaluator.java?rev=1503786&r1=1503785&r2=1503786&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/coord/CoordELEvaluator.java
(original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/coord/CoordELEvaluator.java
Tue Jul 16 16:32:13 2013
@@ -144,7 +144,7 @@ public class CoordELEvaluator {
if (strNominalTime != null) {
appInst.setNominalTime(DateUtils.parseDateOozieTZ(strNominalTime));
appInst.setTimeZone(DateUtils.getTimeZone(eJob.getAttributeValue("timezone")));
-
appInst.setFrequency(Integer.parseInt(eJob.getAttributeValue("frequency")));
+ appInst.setFrequency(eJob.getAttributeValue("frequency"));
appInst.setTimeUnit(TimeUnit.valueOf(eJob.getAttributeValue("freq_timeunit")));
appInst.setActionId(actionId);
appInst.setName(eJob.getAttributeValue("name"));
Modified:
oozie/trunk/core/src/main/java/org/apache/oozie/coord/SyncCoordAction.java
URL:
http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/coord/SyncCoordAction.java?rev=1503786&r1=1503785&r2=1503786&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/coord/SyncCoordAction.java
(original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/coord/SyncCoordAction.java
Tue Jul 16 16:32:13 2013
@@ -29,7 +29,7 @@ public class SyncCoordAction {
private Date nominalTime;
private Date actualTime;
private TimeZone timeZone;
- private int frequency;
+ private String frequency;
private TimeUnit timeUnit;
private TimeUnit endOfDuration; // End of Month or End of Days
@@ -57,11 +57,11 @@ public class SyncCoordAction {
this.timeZone = timeZone;
}
- public int getFrequency() {
+ public String getFrequency() {
return frequency;
}
- public void setFrequency(int frequency) {
+ public void setFrequency(String frequency) {
this.frequency = frequency;
}
Modified: oozie/trunk/release-log.txt
URL:
http://svn.apache.org/viewvc/oozie/trunk/release-log.txt?rev=1503786&r1=1503785&r2=1503786&view=diff
==============================================================================
--- oozie/trunk/release-log.txt (original)
+++ oozie/trunk/release-log.txt Tue Jul 16 16:32:13 2013
@@ -1,5 +1,6 @@
-- Oozie 4.1.0 release (trunk - unreleased)
+OOZIE-1453 Change "frequency" to string in SyncCoordAction.java (bowenzhangusa
via rkanter)
OOZIE-1447 Sqoop actions that don't launch a map reduce job fail with an
IllegalArgumentException (jarcec via rkanter)
OOZIE-1440 Build fails in certain environments due to xerces OpenJPA issue
(mackrorysd via rkanter)
