Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 39BF4200B57 for ; Fri, 22 Jul 2016 19:06:08 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 387A5160A5A; Fri, 22 Jul 2016 17:06:08 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 64E8E160A6D for ; Fri, 22 Jul 2016 19:06:07 +0200 (CEST) Received: (qmail 19663 invoked by uid 500); 22 Jul 2016 17:06:06 -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 19573 invoked by uid 99); 22 Jul 2016 17:06:06 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 22 Jul 2016 17:06:06 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 6D547E0844; Fri, 22 Jul 2016 17:06:06 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dkulp@apache.org To: commits@cxf.apache.org Date: Fri, 22 Jul 2016 17:06:07 -0000 Message-Id: <66548da23e3c42b6864d19d7b0bebdd6@git.apache.org> In-Reply-To: <9315493051f7496e8e959b24d8c2a950@git.apache.org> References: <9315493051f7496e8e959b24d8c2a950@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/9] cxf git commit: Update -Psetup.eclipse to setup workspace based on changes needed for latest checkstyle archived-at: Fri, 22 Jul 2016 17:06:08 -0000 Update -Psetup.eclipse to setup workspace based on changes needed for latest checkstyle Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/3198d8b2 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/3198d8b2 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/3198d8b2 Branch: refs/heads/3.1.x-fixes Commit: 3198d8b2bba180fe40fb6729695b0d0226dd02a8 Parents: 7a365ca Author: Daniel Kulp Authored: Thu Jul 21 10:58:37 2016 -0400 Committer: Daniel Kulp Committed: Fri Jul 22 12:13:14 2016 -0400 ---------------------------------------------------------------------- etc/eclipse/template.checkstyle-config.xml | 9 +++++++-- pom.xml | 4 ++++ .../java/org/apache/cxf/binding/corba/CorbaConduit.java | 9 ++++----- 3 files changed, 15 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/3198d8b2/etc/eclipse/template.checkstyle-config.xml ---------------------------------------------------------------------- diff --git a/etc/eclipse/template.checkstyle-config.xml b/etc/eclipse/template.checkstyle-config.xml index 8f6dbe4..ac7151a 100644 --- a/etc/eclipse/template.checkstyle-config.xml +++ b/etc/eclipse/template.checkstyle-config.xml @@ -18,6 +18,11 @@ under the License. --> - - + + + + + + + http://git-wip-us.apache.org/repos/asf/cxf/blob/3198d8b2/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index d2c233e..26d8201 100644 --- a/pom.xml +++ b/pom.xml @@ -276,14 +276,17 @@ + + + @@ -297,6 +300,7 @@ + http://git-wip-us.apache.org/repos/asf/cxf/blob/3198d8b2/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaConduit.java ---------------------------------------------------------------------- diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaConduit.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaConduit.java index 7518ece..98218ca 100644 --- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaConduit.java +++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaConduit.java @@ -189,14 +189,13 @@ public class CorbaConduit implements Conduit { if (request == null) { throw new CorbaBindingException("Couldn't build the corba request"); } + Exception ex = null; try { request.invoke(); - } catch (SystemException ex) { - message.setContent(Exception.class, new Fault(ex)); - message.setSystemException(ex); - return; + ex = request.env().exception(); + } catch (SystemException sysex) { + ex = sysex; } - Exception ex = request.env().exception(); if (ex != null) { if (ex instanceof SystemException) { message.setContent(Exception.class, new Fault(ex));