Merge pull request #68 from jaysensharma/JBMETA-377

[JBMETA-377] NullPointerException occurs during parsing web.xml with mis...
jboss · Sep 2, 2014 · 7366e38 · 7366e38
2 parents c538212 + d86d980
commit 7366e38
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 0 deletions.
diff --git a/common/src/main/java/org/jboss/metadata/javaee/spec/ParamValueMetaData.java b/common/src/main/java/org/jboss/metadata/javaee/spec/ParamValueMetaData.java
@@ -50,6 +50,20 @@ public void setParamValue(String paramValue) {
         this.paramValue = paramValue;
     }
 
+    public boolean validateParamName() {
+        if (this.paramName == null) {
+            return false;
+        }
+        return true;
+    }
+
+    public boolean validateParamValue() {
+        if (this.paramValue == null) {
+            return false;
+        }
+        return true;
+    }
+
     @Override
     public String toString() {
         StringBuilder tmp = new StringBuilder("ParamValueMetaData(id=");

diff --git a/common/src/main/java/org/jboss/metadata/parser/ee/ParamValueMetaDataParser.java b/common/src/main/java/org/jboss/metadata/parser/ee/ParamValueMetaDataParser.java
@@ -83,6 +83,17 @@ public static ParamValueMetaData parse(XMLStreamReader reader, final PropertyRep
             }
         }
 
+        boolean validParamName = paramValue.validateParamName();
+        boolean validParamValue = paramValue.validateParamValue();
+
+        if (!validParamName) {
+            throw new XMLStreamException("param-name element missing in context-param",reader.getLocation());
+        }
+
+        if (!validParamValue) {
+            throw new XMLStreamException("param-value element missing in context-param",reader.getLocation());
+        }
+
         return paramValue;
     }