Author: veithen
Date: Sun Apr 29 19:14:12 2012
New Revision: 1331978
URL: http://svn.apache.org/viewvc?rev=1331978&view=rev
Log:
Merged r1331616 to the 1.6 branch.
Modified:
axis/axis2/java/core/branches/1_6/ (props changed)
axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/util/MessageContextBuilder.java
axis/axis2/java/core/branches/1_6/modules/saaj/ (props changed)
Propchange: axis/axis2/java/core/branches/1_6/
------------------------------------------------------------------------------
Merged /axis/axis2/java/core/trunk:r1331616
Modified:
axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/util/MessageContextBuilder.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/util/MessageContextBuilder.java?rev=1331978&r1=1331977&r2=1331978&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/util/MessageContextBuilder.java
(original)
+++
axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/util/MessageContextBuilder.java
Sun Apr 29 19:14:12 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);
Propchange: axis/axis2/java/core/branches/1_6/modules/saaj/
------------------------------------------------------------------------------
Merged /axis/axis2/java/core/trunk/modules/saaj:r1331616
