Repository: stratos Updated Branches: refs/heads/4.0.0-grouping 6a29d398e -> 5aac10ea4
fixing a NPE in a debug log :D Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/5aac10ea Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/5aac10ea Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/5aac10ea Branch: refs/heads/4.0.0-grouping Commit: 5aac10ea462943c4d0eb68ab6564046528d81b18 Parents: 6a29d39 Author: Isuru Haththotuwa <[email protected]> Authored: Sat Sep 27 03:27:58 2014 +0530 Committer: Isuru Haththotuwa <[email protected]> Committed: Sat Sep 27 03:27:58 2014 +0530 ---------------------------------------------------------------------- .../application/parser/DefaultApplicationParser.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/5aac10ea/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/application/parser/DefaultApplicationParser.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/application/parser/DefaultApplicationParser.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/application/parser/DefaultApplicationParser.java index 36dc7f8..16c66a5 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/application/parser/DefaultApplicationParser.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/application/parser/DefaultApplicationParser.java @@ -78,12 +78,16 @@ public class DefaultApplicationParser implements ApplicationParser { // get the defined groups Map<String, GroupContext> definedGroups = getDefinedGroups(applicationCtxt); if (log.isDebugEnabled()) { - Set<Map.Entry<String, GroupContext>> groupEntries = definedGroups.entrySet(); - log.debug("Defined Groups: [ "); - for (Map.Entry<String, GroupContext> groupEntry : groupEntries) { - log.debug("Group alias: " + groupEntry.getKey()); + if (definedGroups != null) { + Set<Map.Entry<String, GroupContext>> groupEntries = definedGroups.entrySet(); + log.debug("Defined Groups: [ "); + for (Map.Entry<String, GroupContext> groupEntry : groupEntries) { + log.debug("Group alias: " + groupEntry.getKey()); + } + log.debug(" ]"); + } else { + log.debug("No Group definitions found in app id " + applicationCtxt.getApplicationId()); } - log.debug(" ]"); } // get the Subscribables Information
