You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by jo...@apache.org on 2015/04/21 19:19:04 UTC
ambari git commit: AMBARI-10634 - service_config_versions endpoint
returns invalid group_id for default config group (jonathanhurley)
Repository: ambari
Updated Branches:
refs/heads/trunk 6035a891c -> 5d4fb3177
AMBARI-10634 - service_config_versions endpoint returns invalid group_id for default config group (jonathanhurley)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/5d4fb317
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/5d4fb317
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/5d4fb317
Branch: refs/heads/trunk
Commit: 5d4fb317764cfde48898377975f1df17b20e40a4
Parents: 6035a89
Author: Jonathan Hurley <jh...@hortonworks.com>
Authored: Tue Apr 21 12:54:52 2015 -0400
Committer: Jonathan Hurley <jh...@hortonworks.com>
Committed: Tue Apr 21 13:18:58 2015 -0400
----------------------------------------------------------------------
.../ambari/server/controller/ServiceConfigVersionResponse.java | 2 +-
.../java/org/apache/ambari/server/state/cluster/ClusterTest.java | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/5d4fb317/ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceConfigVersionResponse.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceConfigVersionResponse.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceConfigVersionResponse.java
index b478be8..486d349 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceConfigVersionResponse.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceConfigVersionResponse.java
@@ -89,7 +89,7 @@ public class ServiceConfigVersionResponse {
userName = serviceConfigEntity.getUser();
createTime = serviceConfigEntity.getCreateTimestamp();
note = serviceConfigEntity.getNote();
- groupId = serviceConfigEntity.getGroupId();
+ groupId = (null != serviceConfigEntity.getGroupId() ? serviceConfigEntity.getGroupId(): -1L);
groupName = configGroupName;
hosts = serviceConfigEntity.getHostNames();
http://git-wip-us.apache.org/repos/asf/ambari/blob/5d4fb317/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClusterTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClusterTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClusterTest.java
index 6cd50d8..e076d4e 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClusterTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClusterTest.java
@@ -964,6 +964,8 @@ public class ClusterTest {
Assert.assertEquals("HDFS", hdfsResponse.getServiceName());
Assert.assertEquals("c1", hdfsResponse.getClusterName());
Assert.assertEquals("admin", hdfsResponse.getUserName());
+ Assert.assertEquals("default", hdfsResponse.getGroupName());
+ Assert.assertEquals(Long.valueOf(-1), hdfsResponse.getGroupId());
Assert.assertEquals(Long.valueOf(1), hdfsResponse.getVersion());
c1.addDesiredConfig("admin", Collections.singleton(config2));