Repository: oozie Updated Branches: refs/heads/master 870e47ccc -> 69671d641
OOZIE-2019 SLA miss processed on server2 not send email Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/69671d64 Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/69671d64 Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/69671d64 Branch: refs/heads/master Commit: 69671d641431fef1b605e3b83403699077ec6ebd Parents: 870e47c Author: Purshotam Shah <[email protected]> Authored: Tue Oct 14 10:50:02 2014 -0700 Committer: Purshotam Shah <[email protected]> Committed: Tue Oct 14 10:50:02 2014 -0700 ---------------------------------------------------------------------- .../main/java/org/apache/oozie/sla/SLARegistrationBean.java | 9 +++------ .../apache/oozie/sla/TestSLARegistrationGetJPAExecutor.java | 9 +++++++++ release-log.txt | 1 + 3 files changed, 13 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/69671d64/core/src/main/java/org/apache/oozie/sla/SLARegistrationBean.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/sla/SLARegistrationBean.java b/core/src/main/java/org/apache/oozie/sla/SLARegistrationBean.java index f1e81f2..0770bd3 100644 --- a/core/src/main/java/org/apache/oozie/sla/SLARegistrationBean.java +++ b/core/src/main/java/org/apache/oozie/sla/SLARegistrationBean.java @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.oozie.sla; import java.sql.Timestamp; @@ -24,7 +23,6 @@ import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.StringTokenizer; import java.util.Map.Entry; import javax.persistence.Basic; @@ -289,10 +287,9 @@ public class SLARegistrationBean implements JsonBean { private void slaConfigStringToMap() { if (slaConfig != null) { - StringTokenizer st = new StringTokenizer(slaConfig, "},"); - while (st.hasMoreTokens()) { - String token = st.nextToken(); - String[] pair = token.split("="); + String[] splitString = slaConfig.split("},"); + for (String config : splitString) { + String[] pair = config.split("="); if (pair.length == 2) { slaConfigMap.put(pair[0].substring(1), pair[1]); } http://git-wip-us.apache.org/repos/asf/oozie/blob/69671d64/core/src/test/java/org/apache/oozie/sla/TestSLARegistrationGetJPAExecutor.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/oozie/sla/TestSLARegistrationGetJPAExecutor.java b/core/src/test/java/org/apache/oozie/sla/TestSLARegistrationGetJPAExecutor.java index 6f5d0d4..fe9002c 100644 --- a/core/src/test/java/org/apache/oozie/sla/TestSLARegistrationGetJPAExecutor.java +++ b/core/src/test/java/org/apache/oozie/sla/TestSLARegistrationGetJPAExecutor.java @@ -88,4 +88,13 @@ public class TestSLARegistrationGetJPAExecutor extends XDataTestCase { } } + public void testSlaConfigStringToMap() { + String slaConfig = "{[email protected]},{alert_events=START_MISS,DURATION_MISS,END_MISS},"; + SLARegistrationBean bean = new SLARegistrationBean(); + bean.setSlaConfig(slaConfig); + assertEquals(bean.getSlaConfigMap().size(), 2); + assertEquals(bean.getAlertEvents(), "START_MISS,DURATION_MISS,END_MISS"); + assertEquals(bean.getAlertContact(), "[email protected]"); + } + } http://git-wip-us.apache.org/repos/asf/oozie/blob/69671d64/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index 46a400d..b6865bc 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 4.2.0 release (trunk - unreleased) +OOZIE-2019 SLA miss processed on server2 not send email (puru) OOZIE-1391 Sub wf suspend doesn't update parent wf (jaydeepvishwakarma via shwethags) OOZIE-2023 Job rerun can stuck in prep (puru) OOZIE-1940 StatusTransitService has race condition (puru)
