coheigea closed pull request #486: On HTTP error, XSLTOutInterceptor mangles
the error and triggers a freeze of one minute
URL: https://github.com/apache/cxf/pull/486
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/core/src/main/java/org/apache/cxf/feature/transform/XSLTOutInterceptor.java
b/core/src/main/java/org/apache/cxf/feature/transform/XSLTOutInterceptor.java
index 15620086570..851822f2bb3 100644
---
a/core/src/main/java/org/apache/cxf/feature/transform/XSLTOutInterceptor.java
+++
b/core/src/main/java/org/apache/cxf/feature/transform/XSLTOutInterceptor.java
@@ -159,7 +159,8 @@ public void onFlush(CachedOutputStream wrapper) {
@Override
public void onClose(CachedOutputStream wrapper) {
- InputStream transformedStream = null;
+ InputStream transformedStream;
+ IOException exceptionOnClose = null;
try {
transformedStream = XSLTUtils.transform(xsltTemplate,
wrapper.getInputStream());
IOUtils.copyAndCloseInput(transformedStream, origStream);
@@ -169,9 +170,14 @@ public void onClose(CachedOutputStream wrapper) {
try {
origStream.close();
} catch (IOException e) {
- LOG.warning("Cannot close stream after transformation: " +
e.getMessage());
+ exceptionOnClose = e;
}
}
+
+ if (exceptionOnClose == null) {
+ return;
+ }
+ throw new Fault(exceptionOnClose);
}
}
diff --git
a/systests/uncategorized/src/test/java/org/apache/cxf/systest/transform/feature/TransformFeatureTest.java
b/systests/uncategorized/src/test/java/org/apache/cxf/systest/transform/feature/TransformFeatureTest.java
index 7895a8eca42..b9c5fcd55c9 100644
---
a/systests/uncategorized/src/test/java/org/apache/cxf/systest/transform/feature/TransformFeatureTest.java
+++
b/systests/uncategorized/src/test/java/org/apache/cxf/systest/transform/feature/TransformFeatureTest.java
@@ -62,6 +62,26 @@ public void testClientOutTransformation() {
Assert.assertTrue("Request was not transformed",
response.contains(TRANSFORMED_CONSTANT));
}
+ @Test
+ public void testClientOutTransformationOnNonExistingEndpoint() {
+ Service service = Service.create(SERVICE_NAME);
+ String endpoint = "http://localhost:"; + PORT + "/NonExistent";
+ service.addPort(PORT_NAME, SOAPBinding.SOAP11HTTP_BINDING, endpoint);
+
+ Echo port = service.getPort(PORT_NAME, Echo.class);
+ Client client = ClientProxy.getClient(port);
+ XSLTOutInterceptor outInterceptor = new
XSLTOutInterceptor(XSLT_REQUEST_PATH);
+ client.getOutInterceptors().add(outInterceptor);
+
+ try {
+ port.echo("test");
+ fail("404 Not found was expected");
+ } catch (Exception e) {
+ String exceptionMessage = e.getMessage();
+ assertTrue(exceptionMessage.toLowerCase().contains("404: not
found"));
+ }
+ }
+
@Test
public void testClientInTransformation() {
Service service = Service.create(SERVICE_NAME);
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
