Author: bpoussin Date: 2012-07-12 19:32:01 +0200 (Thu, 12 Jul 2012) New Revision: 209 Url: http://chorem.org/repositories/revision/chorem/209 Log: fix null pointer Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/GenericAction.java Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/GenericAction.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/GenericAction.java 2012-07-12 16:51:03 UTC (rev 208) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/GenericAction.java 2012-07-12 17:32:01 UTC (rev 209) @@ -178,18 +178,20 @@ } } } - + List<String> extExcluded = client.getConfig().getOptionAsList( ChoremConfigOption.CHOREM_EXTENSION_SEARCH_EXCLUSION.key).getOption(); for (String ext : extExcluded) { map.removeAll(ext); } - for (String ext : extension) { - // The wanted extensions should be present, even without wikitties... - Set<Wikitty> wikitties = map.get(ext); - if (wikitties == null || wikitties.isEmpty() ) { - map.put(ext, null); + if (extension != null) { + for (String ext : extension) { + // The wanted extensions should be present, even without wikitties... + Set<Wikitty> wikitties = map.get(ext); + if (wikitties == null || wikitties.isEmpty() ) { + map.put(ext, null); + } } } return map;