From b2061ea8ef1e0999476e546bf0a3970015ba4521 Mon Sep 17 00:00:00 2001 From: Heng Sin Low Date: Tue, 10 Sep 2013 13:15:18 +0800 Subject: [PATCH] Minor: added null check to prevent runtime NPE. --- .../src/org/adempiere/pipo2/AbstractElementHandler.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/org.adempiere.pipo/src/org/adempiere/pipo2/AbstractElementHandler.java b/org.adempiere.pipo/src/org/adempiere/pipo2/AbstractElementHandler.java index 0cffa3e603..fc27a29811 100644 --- a/org.adempiere.pipo/src/org/adempiere/pipo2/AbstractElementHandler.java +++ b/org.adempiere.pipo/src/org/adempiere/pipo2/AbstractElementHandler.java @@ -306,11 +306,14 @@ public abstract class AbstractElementHandler implements ElementHandler { * @return string value */ protected String getStringValue(Element element, String qName, List excludes) { - String name = qName; - String s = element.properties.get(qName).contents.toString(); + if (element == null) return null; + 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) { - excludes.add(name); + excludes.add(qName); } return ((s == null || s.trim().length() == 0) ? null : s.trim()); }