You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2016/04/03 11:54:30 UTC
svn commit: r1737568 - in /axis/axis2/java/core/branches/1_7: ./
modules/addressing/src/org/apache/axis2/handlers/addressing/
modules/jaxws/src/org/apache/axis2/jaxws/message/util/
modules/kernel/src/org/apache/axis2/ modules/kernel/test/org/apache/axi...
Author: veithen
Date: Sun Apr 3 09:54:29 2016
New Revision: 1737568
URL: http://svn.apache.org/viewvc?rev=1737568&view=rev
Log:
Merge r1737567 to the 1.7 branch.
Modified:
axis/axis2/java/core/branches/1_7/ (props changed)
axis/axis2/java/core/branches/1_7/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInFaultHandler.java
axis/axis2/java/core/branches/1_7/modules/jaxws/src/org/apache/axis2/jaxws/message/util/XMLFaultUtils.java
axis/axis2/java/core/branches/1_7/modules/kernel/src/org/apache/axis2/AxisFault.java
axis/axis2/java/core/branches/1_7/modules/kernel/test/org/apache/axis2/util/MessageContextBuilderTest.java
axis/axis2/java/core/branches/1_7/modules/saaj/src/org/apache/axis2/saaj/SOAPFaultImpl.java
Propchange: axis/axis2/java/core/branches/1_7/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Apr 3 09:54:29 2016
@@ -1,4 +1,4 @@
/axis/axis2/java/core/branches/1_6:1295540
/axis/axis2/java/core/branches/AXIOM-420:1334386-1336397
/axis/axis2/java/core/branches/AXIS2-4318:1230452,1295542,1324772,1327468,1329571,1332141,1335355,1335357,1340985
-/axis/axis2/java/core/trunk:1726494,1726509,1726513,1727171,1727174,1727177,1727180,1729891,1730095,1730139,1730180,1730186,1730195,1730197,1730222,1730300,1730308,1730310,1730317,1730322,1730335,1730369,1730427,1730618,1731425,1731441,1731446,1731448,1732354,1733137,1733663,1733713,1733766,1733770,1733773,1733850,1734176,1735331,1736512,1736543,1737030
+/axis/axis2/java/core/trunk:1726494,1726509,1726513,1727171,1727174,1727177,1727180,1729891,1730095,1730139,1730180,1730186,1730195,1730197,1730222,1730300,1730308,1730310,1730317,1730322,1730335,1730369,1730427,1730618,1731425,1731441,1731446,1731448,1732354,1733137,1733663,1733713,1733766,1733770,1733773,1733850,1734176,1735331,1736512,1736543,1737030,1737567
Modified: axis/axis2/java/core/branches/1_7/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInFaultHandler.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInFaultHandler.java?rev=1737568&r1=1737567&r2=1737568&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_7/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInFaultHandler.java (original)
+++ axis/axis2/java/core/branches/1_7/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInFaultHandler.java Sun Apr 3 09:54:29 2016
@@ -90,12 +90,12 @@ public class AddressingInFaultHandler ex
SOAPFaultCode code = fault.getCode();
SOAPFaultSubCode subCode = code.getSubCode();
if (subCode == null) {
- faultLocalName = code.getTextAsQName().getLocalPart();
+ faultLocalName = code.getValueAsQName().getLocalPart();
} else {
while (subCode.getSubCode() != null) {
subCode = subCode.getSubCode();
}
- faultLocalName = subCode.getValue().getTextAsQName().getLocalPart();
+ faultLocalName = subCode.getValueAsQName().getLocalPart();
}
String newReason = AddressingFaultsHelper
Modified: axis/axis2/java/core/branches/1_7/modules/jaxws/src/org/apache/axis2/jaxws/message/util/XMLFaultUtils.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/jaxws/src/org/apache/axis2/jaxws/message/util/XMLFaultUtils.java?rev=1737568&r1=1737567&r2=1737568&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_7/modules/jaxws/src/org/apache/axis2/jaxws/message/util/XMLFaultUtils.java (original)
+++ axis/axis2/java/core/branches/1_7/modules/jaxws/src/org/apache/axis2/jaxws/message/util/XMLFaultUtils.java Sun Apr 3 09:54:29 2016
@@ -151,13 +151,7 @@ public class XMLFaultUtils {
SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI);
SOAPFaultCode soapCode = soapFault.getCode();
- QName codeQName = null;
- if (isSoap11) {
- codeQName = soapCode.getTextAsQName();
- } else {
- codeQName = soapCode.getValue().getTextAsQName();
- }
- XMLFaultCode code = XMLFaultCode.fromQName(codeQName);
+ XMLFaultCode code = XMLFaultCode.fromQName(soapCode.getValueAsQName());
// Get the primary reason text
// TODO what if this fails
@@ -187,9 +181,7 @@ public class XMLFaultUtils {
// Walk the nested sub codes and collect the qnames
while (soapSubCode != null) {
- SOAPFaultValue soapSubCodeValue = soapSubCode.getValue();
- QName qName = soapSubCodeValue.getTextAsQName();
- list.add(qName);
+ list.add(soapSubCode.getValueAsQName());
soapSubCode = soapSubCode.getSubCode();
}
Modified: axis/axis2/java/core/branches/1_7/modules/kernel/src/org/apache/axis2/AxisFault.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/kernel/src/org/apache/axis2/AxisFault.java?rev=1737568&r1=1737567&r2=1737568&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_7/modules/kernel/src/org/apache/axis2/AxisFault.java (original)
+++ axis/axis2/java/core/branches/1_7/modules/kernel/src/org/apache/axis2/AxisFault.java Sun Apr 3 09:54:29 2016
@@ -235,13 +235,13 @@ public class AxisFault extends RemoteExc
if (soapFaultCode != null) {
// This works the same regardless of SOAP version
- faultCode = soapFaultCode.getTextAsQName();
+ faultCode = soapFaultCode.getValueAsQName();
SOAPFaultSubCode subCode = soapFaultCode.getSubCode();
if (subCode != null) {
faultSubCodes = new ArrayList<QName>();
while (subCode != null) {
- faultSubCodes.add(subCode.getValue().getTextAsQName());
+ faultSubCodes.add(subCode.getValueAsQName());
subCode = subCode.getSubCode();
}
}
Modified: axis/axis2/java/core/branches/1_7/modules/kernel/test/org/apache/axis2/util/MessageContextBuilderTest.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/kernel/test/org/apache/axis2/util/MessageContextBuilderTest.java?rev=1737568&r1=1737567&r2=1737568&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_7/modules/kernel/test/org/apache/axis2/util/MessageContextBuilderTest.java (original)
+++ axis/axis2/java/core/branches/1_7/modules/kernel/test/org/apache/axis2/util/MessageContextBuilderTest.java Sun Apr 3 09:54:29 2016
@@ -76,7 +76,7 @@ public class MessageContextBuilderTest e
SOAPFault fault = faultContext.getEnvelope().getBody().getFault();
String se = faultContext.getEnvelope().getNamespace().getPrefix();
- assertEquals (fault.getCode().getTextAsQName().getPrefix(), se);
+ assertEquals (fault.getCode().getValueAsQName().getPrefix(), se);
}
Modified: axis/axis2/java/core/branches/1_7/modules/saaj/src/org/apache/axis2/saaj/SOAPFaultImpl.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/saaj/src/org/apache/axis2/saaj/SOAPFaultImpl.java?rev=1737568&r1=1737567&r2=1737568&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_7/modules/saaj/src/org/apache/axis2/saaj/SOAPFaultImpl.java (original)
+++ axis/axis2/java/core/branches/1_7/modules/saaj/src/org/apache/axis2/saaj/SOAPFaultImpl.java Sun Apr 3 09:54:29 2016
@@ -446,14 +446,7 @@ public class SOAPFaultImpl extends SOAPB
*/
public QName getFaultCodeAsQName() {
SOAPFaultCode soapFaultCode = this.omTarget.getCode();
- if (soapFaultCode != null) {
- if (((SOAPFactory)this.omTarget.getOMFactory()).getSOAPVersion() == SOAP11Version.getSingleton()) {
- return soapFaultCode.getTextAsQName();
- } else {
- return soapFaultCode.getValue().getTextAsQName();
- }
- }
- return null;
+ return soapFaultCode != null ? soapFaultCode.getValueAsQName() : null;
}
/**
@@ -613,8 +606,7 @@ public class SOAPFaultImpl extends SOAPB
ArrayList faultSubcodes = new ArrayList();
SOAPFaultSubCode subCodeElement = this.omTarget.getCode().getSubCode();
while (subCodeElement != null) {
- QName qname = subCodeElement.getValue().getTextAsQName();
- faultSubcodes.add(qname);
+ faultSubcodes.add(subCodeElement.getValueAsQName());
subCodeElement = subCodeElement.getSubCode();
}
return faultSubcodes.iterator();