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 A8D152115 for ; Thu, 21 Apr 2011 10:40:10 +0000 (UTC) Received: (qmail 89526 invoked by uid 500); 21 Apr 2011 10:40:10 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 89483 invoked by uid 500); 21 Apr 2011 10:40:10 -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 89476 invoked by uid 99); 21 Apr 2011 10:40:10 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 21 Apr 2011 10:40:10 +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; Thu, 21 Apr 2011 10:40:08 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 0F1922388A29; Thu, 21 Apr 2011 10:39:47 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1095647 - /cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/OutgoingChainInterceptor.java Date: Thu, 21 Apr 2011 10:39:47 -0000 To: commits@cxf.apache.org From: cschneider@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110421103947.0F1922388A29@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: cschneider Date: Thu Apr 21 10:39:46 2011 New Revision: 1095647 URL: http://svn.apache.org/viewvc?rev=1095647&view=rev Log: Refactored to improve readability Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/OutgoingChainInterceptor.java Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/OutgoingChainInterceptor.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/OutgoingChainInterceptor.java?rev=1095647&r1=1095646&r2=1095647&view=diff ============================================================================== --- cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/OutgoingChainInterceptor.java (original) +++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/OutgoingChainInterceptor.java Thu Apr 21 10:39:46 2011 @@ -56,22 +56,22 @@ public class OutgoingChainInterceptor ex public void handleMessage(Message message) { Exchange ex = message.getExchange(); - BindingOperationInfo bin = ex.get(BindingOperationInfo.class); - if (null != bin && null != bin.getOperationInfo() && bin.getOperationInfo().isOneWay()) { + BindingOperationInfo binding = ex.get(BindingOperationInfo.class); + if (null != binding && null != binding.getOperationInfo() && binding.getOperationInfo().isOneWay()) { closeInput(message); return; } Message out = ex.getOutMessage(); if (out != null) { getBackChannelConduit(message); - if (bin != null) { - out.put(MessageInfo.class, bin.getOperationInfo().getOutput()); - out.put(BindingMessageInfo.class, bin.getOutput()); + if (binding != null) { + out.put(MessageInfo.class, binding.getOperationInfo().getOutput()); + out.put(BindingMessageInfo.class, binding.getOutput()); } InterceptorChain outChain = out.getInterceptorChain(); if (outChain == null) { - outChain = getChain(ex); + outChain = OutgoingChainInterceptor.getChain(ex, chainCache); out.setInterceptorChain(outChain); } outChain.doIntercept(out); @@ -164,7 +164,8 @@ public class OutgoingChainInterceptor ex chain.add(((InterceptorProvider)m.getDestination()).getOutInterceptors()); } } - private PhaseInterceptorChain getChain(Exchange ex) { + + private static PhaseInterceptorChain getChain(Exchange ex, PhaseChainCache chainCache) { Bus bus = ex.get(Bus.class); Binding binding = ex.get(Binding.class);