You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by sb...@apache.org on 2001/01/25 19:05:57 UTC
cvs commit: xml-xalan/java/src/org/apache/xalan/transformer ResultTreeHandler.java
sboag 01/01/25 10:05:55
Modified: java/src/org/apache/xalan/templates ElemElement.java
java/src/org/apache/xalan/transformer ResultTreeHandler.java
Log:
Fix problem with null namespace being passed from xsl:element, which
manifests itself when running the latest DOCBOOK stylesheets.
Revision Changes Path
1.13 +5 -2 xml-xalan/java/src/org/apache/xalan/templates/ElemElement.java
Index: ElemElement.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/templates/ElemElement.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ElemElement.java 2001/01/02 03:36:46 1.12
+++ ElemElement.java 2001/01/25 18:05:44 1.13
@@ -256,7 +256,7 @@
}
// Only do this if name is valid
- String elemNameSpace = null;
+ String elemNameSpace = "";
String prefix = null;
if (null != elemName && null != ns)
@@ -279,7 +279,8 @@
}
// add the prefix to the attribute name.
- elemName = (prefix + ":" + QName.getLocalPart(elemName));
+ if(prefix.length() > 0)
+ elemName = (prefix + ":" + QName.getLocalPart(elemName));
}
}
@@ -287,7 +288,9 @@
executeNSDecls(transformer);
if (null != prefix)
+ {
rhandler.startPrefixMapping(prefix, elemNameSpace, true);
+ }
rhandler.startElement(elemNameSpace, QName.getLocalPart(elemName),
elemName);
1.33 +11 -2 xml-xalan/java/src/org/apache/xalan/transformer/ResultTreeHandler.java
Index: ResultTreeHandler.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/transformer/ResultTreeHandler.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- ResultTreeHandler.java 2001/01/02 03:36:51 1.32
+++ ResultTreeHandler.java 2001/01/25 18:05:51 1.33
@@ -373,15 +373,21 @@
prefix = ""; // bit-o-hack, that that's OK
String existingURI = m_nsSupport.getURI(prefix);
+
+ if(null == existingURI)
+ existingURI = "";
+
+ if(null == uri)
+ uri = "";
- if ((null == existingURI) ||!existingURI.equals(uri))
+ if (!existingURI.equals(uri))
{
if (DEBUG)
{
System.out.println("ResultTreeHandler#startPrefixMapping Prefix: " + prefix);
System.out.println("ResultTreeHandler#startPrefixMapping uri: " + uri);
}
-
+
m_nsSupport.declarePrefix(prefix, uri);
}
}
@@ -954,6 +960,9 @@
name = "xmlns:" + prefix;
String uri = m_nsSupport.getURI(prefix);
+
+ if(null == uri)
+ uri = "";
qe.addAttribute("http://www.w3.org/2000/xmlns/", prefix, name, "CDATA",
uri);