You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by di...@apache.org on 2005/07/10 13:37:57 UTC
svn commit: r210001 - in
/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om:
impl/llom/builder/StAXOMBuilder.java xpath/DocumentNavigator.java
Author: dims
Date: Sun Jul 10 04:37:56 2005
New Revision: 210001
URL: http://svn.apache.org/viewcvs?rev=210001&view=rev
Log:
fix dtd properly
Modified:
webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/builder/StAXOMBuilder.java
webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/xpath/DocumentNavigator.java
Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/builder/StAXOMBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/builder/StAXOMBuilder.java?rev=210001&r1=210000&r2=210001&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/builder/StAXOMBuilder.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/builder/StAXOMBuilder.java Sun Jul 10 04:37:56 2005
@@ -89,6 +89,21 @@
}
/**
+ * Method createDTD
+ *
+ * @return
+ * @throws OMException
+ */
+ protected OMNode createDTD() throws OMException {
+ if(!parser.hasText())
+ return null;
+ OMNode node = omfactory.createText(parser.getText());
+ document.addChild(node);
+ node.setType(OMNode.DTD_NODE);
+ return node;
+ }
+
+ /**
* Method getOMEnvelope
*
* @return
@@ -150,9 +165,10 @@
lastNode.setType(OMNode.COMMENT_NODE);
break;
case XMLStreamConstants.DTD:
- lastNode = createOMText();
- lastNode.setType(OMNode.DTD_NODE);
+ createDTD();
break;
+ case XMLStreamConstants.PROCESSING_INSTRUCTION:
+ throw new OMException();
default :
throw new OMException();
}
Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/xpath/DocumentNavigator.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/xpath/DocumentNavigator.java?rev=210001&r1=210000&r2=210001&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/xpath/DocumentNavigator.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/xpath/DocumentNavigator.java Sun Jul 10 04:37:56 2005
@@ -588,7 +588,9 @@
* @see #isElement
*/
public Object getParentNode(Object contextNode) throws UnsupportedAxisException {
- if(contextNode instanceof OMDocument)
+ if (contextNode == null ||
+ contextNode instanceof OMDocument ||
+ contextNode instanceof OMAttribute)
return null;
return getDocumentNode(((OMNode) contextNode).getParent());
}