You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by ve...@apache.org on 2017/06/03 17:15:54 UTC
svn commit: r1797524 - in /webservices/axiom/trunk:
aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomElementSupport.aj
implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultReasonImpl.java
Author: veithen
Date: Sat Jun 3 17:15:53 2017
New Revision: 1797524
URL: http://svn.apache.org/viewvc?rev=1797524&view=rev
Log:
Ensure consistent behaviour for the getText method.
Modified:
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomElementSupport.aj
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultReasonImpl.java
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomElementSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomElementSupport.aj?rev=1797524&r1=1797523&r2=1797524&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomElementSupport.aj (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomElementSupport.aj Sat Jun 3 17:15:53 2017
@@ -147,8 +147,7 @@ public aspect AxiomElementSupport {
}
}
- // TODO: this is (incorrectly) overridden by the SOAPFaultReason implementations for SOAP 1.2
- public String AxiomElement.getText() {
+ public final String AxiomElement.getText() {
try {
return coreGetCharacterData(ElementAction.SKIP).toString();
} catch (CoreModelException ex) {
Modified: webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultReasonImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultReasonImpl.java?rev=1797524&r1=1797523&r2=1797524&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultReasonImpl.java (original)
+++ webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultReasonImpl.java Sat Jun 3 17:15:53 2017
@@ -23,14 +23,5 @@ import org.apache.axiom.soap.impl.intf.A
import org.apache.axiom.soap.impl.llom.SOAPFaultReasonImpl;
public class SOAP12FaultReasonImpl extends SOAPFaultReasonImpl implements AxiomSOAP12FaultReason {
- /**
- * getText() is overridden here in order to provide a uniform way for SOAP 1.1
- * and SOAP 1.2 to get the "default" reason string.
- *
- * @return the default (local language, or first) reason string
- */
- public String getText() {
- // TODO: Make this look for the correct lang for our locale first
- return getFirstSOAPText().getText();
- }
+
}