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 2016/02/20 16:04:42 UTC
svn commit: r1731410 - in /webservices/axiom/trunk:
aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/
testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/
testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/
Author: veithen
Date: Sat Feb 20 15:04:42 2016
New Revision: 1731410
URL: http://svn.apache.org/viewvc?rev=1731410&view=rev
Log:
Fix an issue with OMElement#getText() that occurs if the OMElement is compact and contains a DataHandler.
Modified:
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreParentNodeSupport.aj
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/OMTestSuiteBuilder.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetTextBinary.java
Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreParentNodeSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreParentNodeSupport.aj?rev=1731410&r1=1731409&r2=1731410&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreParentNodeSupport.aj (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreParentNodeSupport.aj Sat Feb 20 15:04:42 2016
@@ -241,7 +241,7 @@ public aspect CoreParentNodeSupport {
final Object CoreParentNode.internalGetCharacterData(ElementAction elementAction) throws CoreModelException {
if (getState() == COMPACT) {
- return (String)content;
+ return content;
} else {
Object textContent = null;
StringBuilder buffer = null;
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/OMTestSuiteBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/OMTestSuiteBuilder.java?rev=1731410&r1=1731409&r2=1731410&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/OMTestSuiteBuilder.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/OMTestSuiteBuilder.java Sat Feb 20 15:04:42 2016
@@ -329,7 +329,8 @@ public class OMTestSuiteBuilder extends
addTest(new org.apache.axiom.ts.om.element.TestGetTextAsStreamWithNonTextChildren(metaFactory));
addTest(new org.apache.axiom.ts.om.element.TestGetTextAsStreamWithoutCaching(metaFactory));
addTest(new org.apache.axiom.ts.om.element.TestGetTextAsStreamWithSingleTextNode(metaFactory));
- addTest(new org.apache.axiom.ts.om.element.TestGetTextBinary(metaFactory));
+ addTest(new org.apache.axiom.ts.om.element.TestGetTextBinary(metaFactory, false));
+ addTest(new org.apache.axiom.ts.om.element.TestGetTextBinary(metaFactory, true));
addTest(new org.apache.axiom.ts.om.element.TestGetTextWithCDATASectionChild(metaFactory));
addTest(new org.apache.axiom.ts.om.element.TestGetTextWithMixedOMTextChildren(metaFactory));
addTest(new org.apache.axiom.ts.om.element.TestGetXMLStreamReaderCDATAEventFromElement(metaFactory));
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetTextBinary.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetTextBinary.java?rev=1731410&r1=1731409&r2=1731410&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetTextBinary.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetTextBinary.java Sat Feb 20 15:04:42 2016
@@ -27,6 +27,7 @@ import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.om.OMText;
+import org.apache.axiom.om.OMXMLBuilderFactory;
import org.apache.axiom.testutils.activation.RandomDataSource;
import org.apache.axiom.testutils.io.IOTestUtils;
import org.apache.axiom.ts.AxiomTestCase;
@@ -37,8 +38,12 @@ import org.apache.commons.codec.binary.B
* an element that has an {@link OMText} child constructed from a {@link DataHandler}.
*/
public class TestGetTextBinary extends AxiomTestCase {
- public TestGetTextBinary(OMMetaFactory metaFactory) {
+ private final boolean compact;
+
+ public TestGetTextBinary(OMMetaFactory metaFactory, boolean compact) {
super(metaFactory);
+ this.compact = compact;
+ addTestParameter("compact", compact);
}
@Override
@@ -47,6 +52,11 @@ public class TestGetTextBinary extends A
DataSource ds = new RandomDataSource(99999, 1000);
OMElement element = factory.createOMElement("elem", null);
element.addChild(factory.createOMText(new DataHandler(ds), false));
+ if (compact) {
+ // Only the builder can create a compact element containing a DataHandler
+ element = OMXMLBuilderFactory.createStAXOMBuilder(factory, element.getXMLStreamReader()).getDocumentElement();
+ element.build();
+ }
IOTestUtils.compareStreams(ds.getInputStream(),
new ByteArrayInputStream(Base64.decodeBase64(element.getText())));
}