Minor: added null check to prevent runtime NPE.

This commit is contained in:
Heng Sin Low 2013-09-10 13:15:18 +08:00
parent aa21582761
commit b2061ea8ef
1 changed files with 6 additions and 3 deletions

View File

@ -306,11 +306,14 @@ public abstract class AbstractElementHandler implements ElementHandler {
* @return string value * @return string value
*/ */
protected String getStringValue(Element element, String qName, List<String> excludes) { protected String getStringValue(Element element, String qName, List<String> excludes) {
String name = qName; if (element == null) return null;
String s = element.properties.get(qName).contents.toString(); if (qName == null) return null;
Element propertyElement = element.properties.get(qName);
if (propertyElement == null || propertyElement.contents == null) return null;
String s = propertyElement.contents.toString();
if (s != null && s.trim().length() > 0 && excludes != null) { if (s != null && s.trim().length() > 0 && excludes != null) {
excludes.add(name); excludes.add(qName);
} }
return ((s == null || s.trim().length() == 0) ? null : s.trim()); return ((s == null || s.trim().length() == 0) ? null : s.trim());
} }