[104033] Fix for null WSDL namespace validation error.

2 files changed, 5 insertions, 6 deletions

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/WSDLReaderImpl.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/WSDLReaderImpl.java
index a55d46b0f..d90d7ed7e 100644
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/WSDLReaderImpl.java
+++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/WSDLReaderImpl.java
@@ -686,7 +686,7 @@ catch (Exception e)
 
       // If it is, then get the element location information
       elementLocation =
-        (ElementLocation) elementImpl.getUserData(ElementLocation.KEY_NAME);
+        (ElementLocation) elementImpl.getUserData();
 
       // Add it to the list
       this.wsdlElementList.addElement(wsdlElement, elementLocation);
diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/dom/DOMParser.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/dom/DOMParser.java
index 420b65d4a..2ee0361d3 100644
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/dom/DOMParser.java
+++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/dom/DOMParser.java
@@ -73,11 +73,10 @@ public class DOMParser extends org.apache.xerces.parsers.DOMParser
       element = (Element) getProperty(CURRENT_ELEMENT_NODE);
 
       elementImpl = (ElementImpl) element;
-
-      elementImpl.setUserData(
-        ElementLocation.KEY_NAME,
-        (ElementLocation)new ElementLocation(locator.getLineNumber(), locator.getColumnNumber()),
-        null);
+      // Setting the user data with an identifier such as ElementLocation.KEY_NAME
+      // may be a long term good idea. The setUserData method with no id is used 
+      // to support JVMs with alternate versions of Xerces.
+      elementImpl.setUserData(new ElementLocation(locator.getLineNumber(), locator.getColumnNumber()));
     }
     catch (ClassCastException cce)
     {