You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2011/03/14 20:37:05 UTC
svn commit: r1081537 - in /cxf/branches/2.3.x-fixes: ./
common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
Author: dkulp
Date: Mon Mar 14 19:37:04 2011
New Revision: 1081537
URL: http://svn.apache.org/viewvc?rev=1081537&view=rev
Log:
Merged revisions 1081536 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1081536 | dkulp | 2011-03-14 15:35:19 -0400 (Mon, 14 Mar 2011) | 2 lines
Fix from Ondrej Scecina applied relating to element.setPrefix with an
empty string being undefined behavior.
........
Modified:
cxf/branches/2.3.x-fixes/ (props changed)
cxf/branches/2.3.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.3.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java?rev=1081537&r1=1081536&r2=1081537&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java (original)
+++ cxf/branches/2.3.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java Mon Mar 14 19:37:04 2011
@@ -956,7 +956,7 @@ public final class StaxUtils {
case XMLStreamConstants.START_ELEMENT: {
elementCount++;
Element e = doc.createElementNS(reader.getNamespaceURI(), reader.getLocalName());
- if (reader.getPrefix() != null) {
+ if (!StringUtils.isEmpty(reader.getPrefix())) {
e.setPrefix(reader.getPrefix());
}
e = (Element)parent.appendChild(e);