You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by dm...@apache.org on 2014/10/20 20:02:04 UTC
[6/8] git commit: AMBARI-7860. Download client configs not working,
returns 404 (dlysnichenko)
AMBARI-7860. Download client configs not working, returns 404 (dlysnichenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d037437f
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d037437f
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d037437f
Branch: refs/heads/branch-1.7.0
Commit: d037437fe6bf6360e9c5bf0fdc47600770998f7d
Parents: 5ec477c
Author: Lisnichenko Dmitro <dl...@hortonworks.com>
Authored: Mon Oct 20 20:57:44 2014 +0300
Committer: Lisnichenko Dmitro <dl...@hortonworks.com>
Committed: Mon Oct 20 21:01:29 2014 +0300
----------------------------------------------------------------------
.../controller/internal/ClientConfigResourceProvider.java | 2 ++
.../controller/internal/ClientConfigResourceProviderTest.java | 6 +++---
2 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/d037437f/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProvider.java
index 1caae37e..a4d3fea 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProvider.java
@@ -321,6 +321,8 @@ public class ClientConfigResourceProvider extends AbstractControllerResourceProv
throw new SystemException("Controller error ", e);
}
+ Resource resource = new ResourceImpl(Resource.Type.ClientConfig);
+ resources.add(resource);
return resources;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/d037437f/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProviderTest.java
index ef094b5..4d7afb3 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProviderTest.java
@@ -41,6 +41,7 @@ import java.lang.reflect.Method;
import java.util.*;
import static org.easymock.EasyMock.*;
+import static org.junit.Assert.assertFalse;
/**
* TaskResourceProvider tests.
@@ -288,9 +289,8 @@ public class ClientConfigResourceProviderTest {
runtime, process);
PowerMock.replayAll();
- provider.getResources(request, predicate);
-
-
+ Set<Resource> resources = provider.getResources(request, predicate);
+ assertFalse(resources.isEmpty());
// verify
verify(managementController, clusters, cluster, ambariMetaInfo, stackId, componentInfo,commandScriptDefinition,