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 87EF5E1C1 for ; Wed, 13 Feb 2013 18:19:04 +0000 (UTC) Received: (qmail 27602 invoked by uid 500); 13 Feb 2013 18:19:04 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 27537 invoked by uid 500); 13 Feb 2013 18:19:04 -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 27527 invoked by uid 99); 13 Feb 2013 18:19:04 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 13 Feb 2013 18:19:04 +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, 13 Feb 2013 18:19:03 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 9315D238890B; Wed, 13 Feb 2013 18:18:44 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1445793 - in /cxf/trunk/rt/databinding/aegis/src: main/java/org/apache/cxf/aegis/type/basic/BeanTypeInfo.java test/java/org/apache/cxf/aegis/services/Echo.java Date: Wed, 13 Feb 2013 18:18:44 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130213181844.9315D238890B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkulp Date: Wed Feb 13 18:18:43 2013 New Revision: 1445793 URL: http://svn.apache.org/r1445793 Log: [CXF-4810] Fix problem with aegis databinding and Exception class Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BeanTypeInfo.java cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/Echo.java Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BeanTypeInfo.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BeanTypeInfo.java?rev=1445793&r1=1445792&r2=1445793&view=diff ============================================================================== --- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BeanTypeInfo.java (original) +++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BeanTypeInfo.java Wed Feb 13 18:18:43 2013 @@ -277,7 +277,7 @@ public class BeanTypeInfo { // do nothing } else if (RuntimeException.class.isAssignableFrom(beanClass)) { beanInfo = Introspector.getBeanInfo(beanClass, RuntimeException.class); - } else if (Exception.class.isAssignableFrom(beanClass)) { + } else if (Exception.class.isAssignableFrom(beanClass) && !Exception.class.equals(beanClass)) { beanInfo = Introspector.getBeanInfo(beanClass, Exception.class); } else if (Throwable.class.isAssignableFrom(beanClass)) { beanInfo = Introspector.getBeanInfo(beanClass, Throwable.class); Modified: cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/Echo.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/Echo.java?rev=1445793&r1=1445792&r2=1445793&view=diff ============================================================================== --- cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/Echo.java (original) +++ cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/Echo.java Wed Feb 13 18:18:43 2013 @@ -30,7 +30,7 @@ public class Echo { return echo; } - public String simpleEcho(String string) { + public String simpleEcho(String string) throws Exception { return string; } @WebMethod