cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1445834 - in /cxf/branches/2.7.x-fixes/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:45:47 GMT
Author: dkulp
Date: Wed Feb 13 18:45:46 2013
New Revision: 1445834

URL: http://svn.apache.org/r1445834
Log:
Merged revisions 1445793 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1445793 | dkulp | 2013-02-13 13:18:43 -0500 (Wed, 13 Feb 2013) | 2 lines

  [CXF-4810] Fix problem with aegis databinding and Exception class

........

Modified:
    cxf/branches/2.7.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BeanTypeInfo.java
    cxf/branches/2.7.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/Echo.java

Modified: cxf/branches/2.7.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BeanTypeInfo.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BeanTypeInfo.java?rev=1445834&r1=1445833&r2=1445834&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BeanTypeInfo.java
(original)
+++ cxf/branches/2.7.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BeanTypeInfo.java
Wed Feb 13 18:45:46 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/branches/2.7.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/Echo.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/Echo.java?rev=1445834&r1=1445833&r2=1445834&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/Echo.java
(original)
+++ cxf/branches/2.7.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/Echo.java
Wed Feb 13 18:45:46 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



Mime
View raw message