OOZIE-2525 SchemaChecker fails with NPE (rkanter)
Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/5759397a Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/5759397a Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/5759397a Branch: refs/heads/oya Commit: 5759397a939375d235fa75165ff26bd6fcca8f75 Parents: bcd23e1 Author: Robert Kanter <rkan...@cloudera.com> Authored: Tue Sep 20 12:05:43 2016 -0700 Committer: Robert Kanter <rkan...@cloudera.com> Committed: Tue Sep 20 12:05:43 2016 -0700 ---------------------------------------------------------------------- .../java/org/apache/oozie/service/SchemaCheckerService.java | 8 ++++---- release-log.txt | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/5759397a/core/src/main/java/org/apache/oozie/service/SchemaCheckerService.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/service/SchemaCheckerService.java b/core/src/main/java/org/apache/oozie/service/SchemaCheckerService.java index 7fda9e2..1101f99 100644 --- a/core/src/main/java/org/apache/oozie/service/SchemaCheckerService.java +++ b/core/src/main/java/org/apache/oozie/service/SchemaCheckerService.java @@ -45,7 +45,7 @@ public class SchemaCheckerService implements Service, Instrumentable { int interval = ConfigurationService.getInt(CONF_INTERVAL); if (dbType.equals("derby") || dbType.equals("hsqldb") || dbType.equals("sqlserver") || interval <= 0) { LOG.debug("SchemaCheckerService is disabled: not supported for {0}", dbType); - status = "DISABLED (" + dbType + " no supported)"; + status = "DISABLED (" + dbType + " not supported)"; } else { String driver = ConfigurationService.get(JPAService.CONF_DRIVER); String user = ConfigurationService.get(JPAService.CONF_USERNAME); @@ -96,7 +96,7 @@ public class SchemaCheckerService implements Service, Instrumentable { lastCheck = time.toString(); } - static class SchemaCheckerRunnable implements Runnable { + private class SchemaCheckerRunnable implements Runnable { private String dbType; private String url; private String user; @@ -117,8 +117,8 @@ public class SchemaCheckerService implements Service, Instrumentable { Services.get().get(CallableQueueService.class).queue( new SchemaCheckXCommand(dbType, url, user, pass, ignoreExtras)); } else { - Services.get().get(SchemaCheckerService.class).status = "DISABLED (not leader in HA)"; - Services.get().get(SchemaCheckerService.class).lastCheck = "N/A"; + status = "DISABLED (not leader in HA)"; + lastCheck = "N/A"; } } } http://git-wip-us.apache.org/repos/asf/oozie/blob/5759397a/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index cef8876..5f939e8 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 4.3.0 release (trunk - unreleased) +OOZIE-2525 SchemaChecker fails with NPE (rkanter) OOZIE-2672 SLA periodic update does not remove job from map if job is removed from database (satishsaley via puru) OOZIE-2498 Oozie CallerId configuration for downstream components (abhishekbafna via rohini) OOZIE-2491 oozie acl cannot specify group,it does`t work (abhishekbafna via rohini)
