Author: veithen
Date: Sun Apr 29 20:13:24 2012
New Revision: 1331986
URL: http://svn.apache.org/viewvc?rev=1331986&view=rev
Log:
Merged r1331616 to the 1.5 branch.
Modified:
axis/axis2/java/core/branches/1_5/ (props changed)
axis/axis2/java/core/branches/1_5/modules/distribution/ (props changed)
axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java
(props changed)
axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/util/MessageContextBuilder.java
axis/axis2/java/core/branches/1_5/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java
(props changed)
axis/axis2/java/core/branches/1_5/modules/parent/ (props changed)
axis/axis2/java/core/branches/1_5/modules/saaj/test/org/apache/axis2/saaj/TestUtils.java
(props changed)
axis/axis2/java/core/branches/1_5/modules/soapmonitor/module/ (props
changed)
axis/axis2/java/core/branches/1_5/modules/soapmonitor/module/pom.xml
(props changed)
axis/axis2/java/core/branches/1_5/modules/soapmonitor/module/src/main/java/org/apache/axis2/handlers/
(props changed)
axis/axis2/java/core/branches/1_5/modules/soapmonitor/module/src/main/resources/META-INF/module.xml
(props changed)
axis/axis2/java/core/branches/1_5/modules/soapmonitor/servlet/ (props
changed)
axis/axis2/java/core/branches/1_5/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/applet/
(props changed)
axis/axis2/java/core/branches/1_5/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/servlet/
(props changed)
axis/axis2/java/core/branches/1_5/modules/tool/axis2-repo-maven-plugin/
(props changed)
axis/axis2/java/core/branches/1_5/modules/transport/http/pom.xml (props
changed)
axis/axis2/java/core/branches/1_5/modules/transport/http/src/ (props
changed)
axis/axis2/java/core/branches/1_5/modules/transport/local/ (props changed)
axis/axis2/java/core/branches/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java
(props changed)
axis/axis2/java/core/branches/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java
(props changed)
Propchange: axis/axis2/java/core/branches/1_5/
------------------------------------------------------------------------------
Merged /axis/axis2/java/core/trunk:r1331616
Propchange: axis/axis2/java/core/branches/1_5/modules/distribution/
------------------------------------------------------------------------------
Merged /axis/axis2/java/core/trunk/modules/distribution:r1331616
Propchange:
axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java
------------------------------------------------------------------------------
Merged
/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java:r1331616
Modified:
axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/util/MessageContextBuilder.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/util/MessageContextBuilder.java?rev=1331986&r1=1331985&r2=1331986&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/util/MessageContextBuilder.java
(original)
+++
axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/util/MessageContextBuilder.java
Sun Apr 29 20:13:24 2012
@@ -482,13 +482,13 @@ public class MessageContextBuilder {
if (faultCodeQName.getLocalPart().indexOf(":") == -1) {
String prefix = faultCodeQName.getPrefix();
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();
} else {
soapFaultCode = faultCodeQName.getLocalPart();
Propchange:
axis/axis2/java/core/branches/1_5/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java
------------------------------------------------------------------------------
Merged
/axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java:r1331616
Propchange: axis/axis2/java/core/branches/1_5/modules/parent/
------------------------------------------------------------------------------
Merged /axis/axis2/java/core/trunk/modules/parent:r1331616
Propchange:
axis/axis2/java/core/branches/1_5/modules/saaj/test/org/apache/axis2/saaj/TestUtils.java
------------------------------------------------------------------------------
Merged
/axis/axis2/java/core/trunk/modules/saaj/test/org/apache/axis2/saaj/TestUtils.java:r1331616
Propchange: axis/axis2/java/core/branches/1_5/modules/soapmonitor/module/
------------------------------------------------------------------------------
Merged /axis/axis2/java/core/trunk/modules/soapmonitor/module:r1331616
Propchange: axis/axis2/java/core/branches/1_5/modules/soapmonitor/module/pom.xml
------------------------------------------------------------------------------
Merged /axis/axis2/java/core/trunk/modules/soapmonitor/module/pom.xml:r1331616
Propchange:
axis/axis2/java/core/branches/1_5/modules/soapmonitor/module/src/main/java/org/apache/axis2/handlers/
------------------------------------------------------------------------------
Merged
/axis/axis2/java/core/trunk/modules/soapmonitor/module/src/main/java/org/apache/axis2/handlers:r1331616
Propchange:
axis/axis2/java/core/branches/1_5/modules/soapmonitor/module/src/main/resources/META-INF/module.xml
------------------------------------------------------------------------------
Merged
/axis/axis2/java/core/trunk/modules/soapmonitor/module/src/main/resources/META-INF/module.xml:r1331616
Propchange: axis/axis2/java/core/branches/1_5/modules/soapmonitor/servlet/
------------------------------------------------------------------------------
Merged /axis/axis2/java/core/trunk/modules/soapmonitor/servlet:r1331616
Propchange:
axis/axis2/java/core/branches/1_5/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/applet/
------------------------------------------------------------------------------
Merged
/axis/axis2/java/core/trunk/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/applet:r1331616
Propchange:
axis/axis2/java/core/branches/1_5/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/servlet/
------------------------------------------------------------------------------
Merged
/axis/axis2/java/core/trunk/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/servlet:r1331616
Propchange:
axis/axis2/java/core/branches/1_5/modules/tool/axis2-repo-maven-plugin/
------------------------------------------------------------------------------
Merged
/axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin:r1331616
Propchange: axis/axis2/java/core/branches/1_5/modules/transport/http/pom.xml
------------------------------------------------------------------------------
Merged /axis/axis2/java/core/trunk/modules/transport/http/pom.xml:r1331616
Propchange: axis/axis2/java/core/branches/1_5/modules/transport/http/src/
------------------------------------------------------------------------------
Merged /axis/axis2/java/core/trunk/modules/transport/http/src:r1331616
Propchange: axis/axis2/java/core/branches/1_5/modules/transport/local/
------------------------------------------------------------------------------
Merged /axis/axis2/java/core/trunk/modules/transport/local:r1331616
Propchange:
axis/axis2/java/core/branches/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java
------------------------------------------------------------------------------
Merged
/axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java:r1331616
Propchange:
axis/axis2/java/core/branches/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java
------------------------------------------------------------------------------
Merged
/axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java:r1331616
