cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r632396 - in /incubator/cxf/branches/2.0.x-fixes: ./ rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/xml/stax/ElementWriter.java
Date Fri, 29 Feb 2008 17:15:29 GMT
Author: dkulp
Date: Fri Feb 29 09:15:21 2008
New Revision: 632396

URL: http://svn.apache.org/viewvc?rev=632396&view=rev
Log:
Merged revisions 632374 via svnmerge from 
https://svn.apache.org/repos/asf/incubator/cxf/trunk

........
  r632374 | dkulp | 2008-02-29 11:18:08 -0500 (Fri, 29 Feb 2008) | 2 lines
  
  Fix an interaction issue between Aegis and SAAJOutInterceptor
........

Modified:
    incubator/cxf/branches/2.0.x-fixes/   (props changed)
    incubator/cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/xml/stax/ElementWriter.java

Propchange: incubator/cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: incubator/cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/xml/stax/ElementWriter.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/xml/stax/ElementWriter.java?rev=632396&r1=632395&r2=632396&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/xml/stax/ElementWriter.java
(original)
+++ incubator/cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/xml/stax/ElementWriter.java
Fri Feb 29 09:15:21 2008
@@ -100,9 +100,18 @@
             String decPrefix = writer.getNamespaceContext().getPrefix(namespace);
 
             // If the user didn't specify a prefix, create one
-            if (StringUtils.isEmpty(prefix) && decPrefix == null) {
-                declare = true;
-                prefix = NamespaceHelper.getUniquePrefix(writer);
+            if (StringUtils.isEmpty(prefix) 
+                && decPrefix == null) {
+               
+                if (!StringUtils.isEmpty(namespace)) {
+                    declare = true;
+                    prefix = NamespaceHelper.getUniquePrefix(writer);
+                } else {
+                    prefix = "";
+                    if (!StringUtils.isEmpty(writer.getNamespaceContext().getNamespaceURI("")))
{
+                        declare = true;
+                    }
+                }
             } else if (StringUtils.isEmpty(prefix)) {
                 prefix = decPrefix;
             } else if (!prefix.equals(decPrefix)) {



Mime
View raw message