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 E3E2A10101 for ; Wed, 16 Oct 2013 19:26:24 +0000 (UTC) Received: (qmail 31370 invoked by uid 500); 16 Oct 2013 19:26:21 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 31284 invoked by uid 500); 16 Oct 2013 19:26:21 -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 31264 invoked by uid 99); 16 Oct 2013 19:26:14 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 16 Oct 2013 19:26:14 +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, 16 Oct 2013 19:26:12 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 1C37523889FD; Wed, 16 Oct 2013 19:25:51 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1532871 - /cxf/trunk/rt/transports/local/src/main/java/org/apache/cxf/transport/local/LocalConduit.java Date: Wed, 16 Oct 2013 19:25:51 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20131016192551.1C37523889FD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkulp Date: Wed Oct 16 19:25:50 2013 New Revision: 1532871 URL: http://svn.apache.org/r1532871 Log: If the dispatch throws an excpetion (likely from the fault out chain), try to do something smart with it. Modified: cxf/trunk/rt/transports/local/src/main/java/org/apache/cxf/transport/local/LocalConduit.java Modified: cxf/trunk/rt/transports/local/src/main/java/org/apache/cxf/transport/local/LocalConduit.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/local/src/main/java/org/apache/cxf/transport/local/LocalConduit.java?rev=1532871&r1=1532870&r2=1532871&view=diff ============================================================================== --- cxf/trunk/rt/transports/local/src/main/java/org/apache/cxf/transport/local/LocalConduit.java (original) +++ cxf/trunk/rt/transports/local/src/main/java/org/apache/cxf/transport/local/LocalConduit.java Wed Oct 16 19:25:50 2013 @@ -82,7 +82,23 @@ public class LocalConduit extends Abstra ex.setInMessage(inMsg); inMsg.setExchange(ex); ex.put(IN_EXCHANGE, exchange); - destination.getMessageObserver().onMessage(inMsg); + try { + destination.getMessageObserver().onMessage(inMsg); + } catch (Throwable t) { + Message m = inMsg.getExchange().getOutFaultMessage(); + if (m == null) { + m = inMsg.getExchange().getOutMessage(); + } + if (m != null) { + try { + m.put(Message.RESPONSE_CODE, 500); + m.getExchange().put(Message.RESPONSE_CODE, 500); + m.getContent(OutputStream.class).close(); + } catch (IOException e) { + //ignore + } + } + } } }; Executor ex = message.getExchange() != null