Repository: ambari Updated Branches: refs/heads/trunk 7f0ef185c -> c81390eaf
AMBARI-9974 Sometimes adding Ranger process hangs (dsen) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c81390ea Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c81390ea Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c81390ea Branch: refs/heads/trunk Commit: c81390eaf0d7c56250b4faed2ab108fa0887042e Parents: 7f0ef18 Author: Dmytro Sen <[email protected]> Authored: Mon Mar 9 00:14:01 2015 +0200 Committer: Dmytro Sen <[email protected]> Committed: Mon Mar 9 00:14:01 2015 +0200 ---------------------------------------------------------------------- .../src/main/java/org/apache/ambari/server/state/StackId.java | 2 +- .../server/state/svccomphost/ServiceComponentHostImpl.java | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/c81390ea/ambari-server/src/main/java/org/apache/ambari/server/state/StackId.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/StackId.java b/ambari-server/src/main/java/org/apache/ambari/server/state/StackId.java index 0ac1ddb..0be39c1 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/state/StackId.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/state/StackId.java @@ -121,7 +121,7 @@ public class StackId implements Comparable<StackId> { public static void parseStackIdHelper(StackId stackVersion, String stackId) { - if (stackId.isEmpty()) { + if (stackId == null || stackId.isEmpty()) { stackVersion.stackName = ""; stackVersion.stackVersion = ""; return; http://git-wip-us.apache.org/repos/asf/ambari/blob/c81390ea/ambari-server/src/main/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostImpl.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostImpl.java index 869c475..7975f4e 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostImpl.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostImpl.java @@ -1014,7 +1014,11 @@ public class ServiceComponentHostImpl implements ServiceComponentHost { public StackId getStackVersion() { readLock.lock(); try { - return gson.fromJson(getStateEntity().getCurrentStackVersion(), StackId.class); + HostComponentStateEntity schStateEntity = getStateEntity(); + if (schStateEntity == null) { + return new StackId(); + } + return gson.fromJson(schStateEntity.getCurrentStackVersion(), StackId.class); } finally { readLock.unlock(); }
