Author: ay Date: Wed Feb 15 18:10:45 2012 New Revision: 1244621 URL: http://svn.apache.org/viewvc?rev=1244621&view=rev Log: Merged revisions 1244615 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
................ r1244615 | ay | 2012-02-15 19:06:45 +0100 (Wed, 15 Feb 2012) | 9 lines Merged revisions 1244611 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1244611 | ay | 2012-02-15 19:01:19 +0100 (Wed, 15 Feb 2012) | 1 line add an option to clear FaultThrowingInterceptor in testutils ControlImpl ........ ................ Modified: cxf/branches/2.4.x-fixes/ (props changed) cxf/branches/2.4.x-fixes/testutils/src/main/java/org/apache/cxf/greeter_control/ControlImpl.java Propchange: cxf/branches/2.4.x-fixes/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Wed Feb 15 18:10:45 2012 @@ -0,0 +1,2 @@ +/cxf/branches/2.5.x-fixes:1244615 +/cxf/trunk:1244611 Propchange: cxf/branches/2.4.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.4.x-fixes/testutils/src/main/java/org/apache/cxf/greeter_control/ControlImpl.java URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/testutils/src/main/java/org/apache/cxf/greeter_control/ControlImpl.java?rev=1244621&r1=1244620&r2=1244621&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/testutils/src/main/java/org/apache/cxf/greeter_control/ControlImpl.java (original) +++ cxf/branches/2.4.x-fixes/testutils/src/main/java/org/apache/cxf/greeter_control/ControlImpl.java Wed Feb 15 18:10:45 2012 @@ -122,6 +122,10 @@ public class ControlImpl implements Cont break; } } + if (null == fl.getPhase() || "".equals(fl.getPhase())) { + LOG.fine("Removed FaultThrowingInterceptor"); + return; + } fi = new FaultThrowingInterceptor(fl.getPhase()); if (null != fl.getBefore() && !"".equals(fl.getBefore())) {
