Repository: incubator-slider Updated Branches: refs/heads/develop 50db94ce4 -> ac3beff15
SLIDER-875 add helper method for getMetaInfo(null) Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/ac3beff1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/ac3beff1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/ac3beff1 Branch: refs/heads/develop Commit: ac3beff159e74217fbbf1b8cf18480803fae7468 Parents: 50db94c Author: Billie Rinaldi <billie.rina...@gmail.com> Authored: Thu Aug 18 06:47:08 2016 -0700 Committer: Billie Rinaldi <billie.rina...@gmail.com> Committed: Thu Aug 18 06:47:08 2016 -0700 ---------------------------------------------------------------------- .../slider/providers/agent/AgentProviderService.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/ac3beff1/slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java b/slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java index 7594d51..2ab5c6f 100644 --- a/slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java +++ b/slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java @@ -1435,8 +1435,7 @@ public class AgentProviderService extends AbstractProviderService implements // identify client component Component client = null; - for (Component component : getMetaInfo(null).getApplication() - .getComponents()) { + for (Component component : getMetaInfo().getApplication().getComponents()) { if (component.getCategory().equals("CLIENT")) { client = component; break; @@ -1466,8 +1465,7 @@ public class AgentProviderService extends AbstractProviderService implements throw new IOException(e); } - for (ConfigFile configFile : getMetaInfo(null) - .getComponentConfigFiles(client.getName())) { + for (ConfigFile configFile : getMetaInfo().getComponentConfigFiles(client.getName())) { addNamedConfiguration(configFile.getDictionaryName(), appConf.getGlobalOptions().options, configurations, tokens, null, client.getName(), client.getName()); @@ -1481,8 +1479,7 @@ public class AgentProviderService extends AbstractProviderService implements //do a final replacement of re-used configs dereferenceAllConfigs(configurations); - for (ConfigFile configFile : getMetaInfo(null) - .getComponentConfigFiles(client.getName())) { + for (ConfigFile configFile : getMetaInfo().getComponentConfigFiles(client.getName())) { ConfigFormat configFormat = ConfigFormat.resolve(configFile.getType()); Map<String, String> config = configurations.get(configFile.getDictionaryName()); @@ -1598,6 +1595,10 @@ public class AgentProviderService extends AbstractProviderService implements return workFolderExports; } + protected Metainfo getMetaInfo() { + return getMetaInfo(null); + } + @VisibleForTesting protected Metainfo getMetaInfo(String roleGroup) { String mapKey = DEFAULT_METAINFO_MAP_KEY;
