Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 0360C96CB for ; Wed, 15 Feb 2012 18:11:09 +0000 (UTC) Received: (qmail 98783 invoked by uid 500); 15 Feb 2012 18:11:08 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 98728 invoked by uid 500); 15 Feb 2012 18:11:08 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 98721 invoked by uid 99); 15 Feb 2012 18:11:08 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 15 Feb 2012 18:11:08 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 15 Feb 2012 18:11:06 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id DC57B23888E4; Wed, 15 Feb 2012 18:10:45 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1244621 - in /cxf/branches/2.4.x-fixes: ./ testutils/src/main/java/org/apache/cxf/greeter_control/ControlImpl.java Date: Wed, 15 Feb 2012 18:10:45 -0000 To: commits@cxf.apache.org From: ay@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120215181045.DC57B23888E4@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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())) {