svn commit: r1331616 - /axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/MessageContextBuilder.java

[ve...@apache.org]

Author: veithen
Date: Fri Apr 27 22:42:39 2012
New Revision: 1331616

URL: http://svn.apache.org/viewvc?rev=1331616&view=rev
Log:
Avoid the "Deprecated usage of OMElement#declareNamespace(String,String) with empty prefix" warning with Axiom 1.2.13.

Modified:
    axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/MessageContextBuilder.java

Modified: axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/MessageContextBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/MessageContextBuilder.java?rev=1331616&r1=1331615&r2=1331616&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/MessageContextBuilder.java (original)
+++ axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/MessageContextBuilder.java Fri Apr 27 22:42:39 2012
@@ -570,13 +570,13 @@ public class MessageContextBuilder {
                         	log.debug("prefix = "+prefix);
                         }
                         String uri = faultCodeQName.getNamespaceURI();
-                        // Get the specified prefix and uri
-                        prefix = prefix == null ? "" : prefix;
+                        // Get the specified uri
                         uri = uri == null || "" .equals(uri) ?
                                 fault.getNamespace().getNamespaceURI() : uri;
                         // Make sure the prefix and uri are declared on the fault, and 
-                        // get the resulting prefix.
-                        prefix = fault.declareNamespace(uri, prefix).getPrefix();
+                        // get the resulting prefix. If no prefix is defined, let declareNamespace
+                        // generate one.
+                        prefix = fault.declareNamespace(uri, prefix.length() == 0 ? null : prefix).getPrefix();
                         soapFaultCode = prefix + ":" + faultCodeQName.getLocalPart();
                         if(log.isDebugEnabled()){
                         	log.debug("Altered soapFaultCode ="+soapFaultCode);