Fix for HER-1962 NPE from missing sheet

* SheetOverlaysManager.java
    getOverlayMap(String) - return null if sheet missing instead of triggering npe
* KeyedProperties.java
    get(String) - check for null return value from getOverlayMap() and log warning
This commit is contained in:
Noah Levitt
2011-10-27 10:40:30 -07:00
parent 9b418bbb76
commit 995133dc40
2 changed files with 18 additions and 5 deletions
@@ -169,7 +169,12 @@ BeanFactoryAware, OverlayMapsSource, ApplicationListener {
* @see org.archive.spring.OverlayMapsSource#getOverlayMap(java.lang.String)
*/
public Map<String, Object> getOverlayMap(String name) {
return sheetsByName.get(name).getMap();
Sheet sheet = sheetsByName.get(name);
if (sheet != null) {
return sheet.getMap();
} else {
return null;
}
}
/**