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/08/29 05:34:15 UTC
svn commit: r264044 - in
/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2:
om/impl/llom/OMElementImpl.java om/impl/llom/builder/StAXOMBuilder.java
om/xpath/DocumentNavigator.java
soap/impl/llom/builder/StAXSOAPModelBuilder.java
Author: dims
Date: Sun Aug 28 20:34:11 2005
New Revision: 264044
URL: http://svn.apache.org/viewcvs?rev=264044&view=rev
Log:
- more checks for namespaceURI being null
- set IS_COALESCING property to ensure that we get correct # of text nodes.
Modified:
webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMElementImpl.java
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
webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/builder/StAXSOAPModelBuilder.java
Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMElementImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMElementImpl.java?rev=264044&r1=264043&r2=264044&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMElementImpl.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMElementImpl.java Sun Aug 28 20:34:11 2005
@@ -124,7 +124,7 @@
// first try to find a namespace from the scope
String namespaceURI = qname.getNamespaceURI();
- if (!"".equals(namespaceURI)) {
+ if (namespaceURI != null && namespaceURI.length() > 0) {
ns = findNamespace(qname.getNamespaceURI(),
qname.getPrefix());
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=264044&r1=264043&r2=264044&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 Aug 28 20:34:11 2005
@@ -279,7 +279,7 @@
String namespaceURI = parser.getNamespaceURI();
String prefix = parser.getPrefix();
OMNamespace namespace = null;
- if (!"".equals(namespaceURI)) {
+ if (namespaceURI != null && namespaceURI.length() > 0) {
if (prefix == null) {
// this means, this elements has a default namespace or it has inherited a default namespace from its parent
namespace = node.findNamespace(namespaceURI, "");
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=264044&r1=264043&r2=264044&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 Aug 28 20:34:11 2005
@@ -526,14 +526,14 @@
throws FunctionCallException {
try {
XMLStreamReader parser;
+ XMLInputFactory xmlInputFactory = XMLInputFactory.newInstance();
+ xmlInputFactory.setProperty(XMLInputFactory.IS_COALESCING, Boolean.TRUE);
if (uri.indexOf(':') == -1) {
- parser =
- XMLInputFactory.newInstance().createXMLStreamReader(
+ parser = xmlInputFactory.createXMLStreamReader(
new FileInputStream(uri));
} else {
URL url = new URL(uri);
- parser =
- XMLInputFactory.newInstance().createXMLStreamReader(
+ parser = xmlInputFactory.createXMLStreamReader(
url.openStream());
}
StAXOMBuilder builder =
Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/builder/StAXSOAPModelBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/builder/StAXSOAPModelBuilder.java?rev=264044&r1=264043&r2=264044&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/builder/StAXSOAPModelBuilder.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/builder/StAXSOAPModelBuilder.java Sun Aug 28 20:34:11 2005
@@ -394,7 +394,7 @@
String namespaceURI = parser.getNamespaceURI();
String prefix = parser.getPrefix();
OMNamespace namespace = null;
- if (!"".equals(namespaceURI)) {
+ if (namespaceURI != null && namespaceURI.length() > 0) {
if (prefix == null) {
// this means, this elements has a default namespace or it has inherited a default namespace from its parent
namespace = node.findNamespace(namespaceURI, "");