You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2013/09/12 18:06:45 UTC
svn commit: r1522646 - in /cxf/branches/2.7.x-fixes: ./
api/src/main/java/org/apache/cxf/interceptor/transform/TransformOutInterceptor.java
rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetInterceptor.java
Author: sergeyb
Date: Thu Sep 12 16:06:45 2013
New Revision: 1522646
URL: http://svn.apache.org/r1522646
Log:
Merged revisions 1522631 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1522631 | sergeyb | 2013-09-12 16:45:12 +0100 (Thu, 12 Sep 2013) | 1 line
[CXF-5276] Updating TransformOutInterceptor to ignore the messages if transform.skip property is set
........
Modified:
cxf/branches/2.7.x-fixes/ (props changed)
cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/interceptor/transform/TransformOutInterceptor.java
cxf/branches/2.7.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetInterceptor.java
Propchange: cxf/branches/2.7.x-fixes/
------------------------------------------------------------------------------
Merged /cxf/trunk:r1522631
Propchange: cxf/branches/2.7.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/interceptor/transform/TransformOutInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/interceptor/transform/TransformOutInterceptor.java?rev=1522646&r1=1522645&r2=1522646&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/interceptor/transform/TransformOutInterceptor.java (original)
+++ cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/interceptor/transform/TransformOutInterceptor.java Thu Sep 12 16:06:45 2013
@@ -44,6 +44,7 @@ public class TransformOutInterceptor ext
private static final String OUTPUT_STREAM_HOLDER =
TransformOutInterceptor.class.getName() + ".outputstream";
+ private static final String TRANSFORM_SKIP = "transform.skip";
private static final StaxOutEndingInterceptor ENDING = new StaxOutEndingInterceptor(OUTPUT_STREAM_HOLDER);
private Map<String, String> outElementsMap;
@@ -85,7 +86,8 @@ public class TransformOutInterceptor ext
return;
}
- if (skipOnFault && null != message.getContent(Exception.class)) {
+ if (skipOnFault && null != message.getContent(Exception.class)
+ || MessageUtils.isTrue(message.getContextualProperty(TRANSFORM_SKIP))) {
return;
}
Modified: cxf/branches/2.7.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetInterceptor.java?rev=1522646&r1=1522645&r2=1522646&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetInterceptor.java (original)
+++ cxf/branches/2.7.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetInterceptor.java Thu Sep 12 16:06:45 2013
@@ -40,6 +40,7 @@ import org.apache.cxf.service.model.Endp
public class WSDLGetInterceptor extends AbstractPhaseInterceptor<Message> {
public static final WSDLGetInterceptor INSTANCE = new WSDLGetInterceptor();
public static final String DOCUMENT_HOLDER = WSDLGetInterceptor.class.getName() + ".documentHolder";
+ private static final String TRANSFORM_SKIP = "transform.skip";
private Interceptor<Message> wsdlGetOutInterceptor = WSDLGetOutInterceptor.INSTANCE;
public WSDLGetInterceptor() {
@@ -98,6 +99,7 @@ public class WSDLGetInterceptor extends
// notice this is being added after the purge above, don't swap the order!
mout.getInterceptorChain().add(wsdlGetOutInterceptor);
+ message.getExchange().put(TRANSFORM_SKIP, Boolean.TRUE);
// skip the service executor and goto the end of the chain.
message.getInterceptorChain().doInterceptStartingAt(
message,