Author: dkulp Date: Mon Jan 28 17:48:35 2013 New Revision: 1439524 URL: http://svn.apache.org/viewvc?rev=1439524&view=rev Log: Merged revisions 1439486 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes
........ r1439486 | dkulp | 2013-01-28 11:44:33 -0500 (Mon, 28 Jan 2013) | 11 lines Merged revisions 1438104 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1438104 | dkulp | 2013-01-24 12:47:34 -0500 (Thu, 24 Jan 2013) | 3 lines [CXF-4748] Add getMessage to generated schemas for exceptions to match RI and spec Patch from Iris Ding applied ........ ........ Modified: cxf/branches/2.6.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java Modified: cxf/branches/2.6.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java?rev=1439524&r1=1439523&r2=1439524&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java (original) +++ cxf/branches/2.6.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java Mon Jan 28 17:48:35 2013 @@ -390,7 +390,8 @@ class JAXBContextInitializer extends Ser // must not have parameters and return type must not be void if (method.getReturnType() == Void.class || method.getParameterTypes().length != 0 - || method.getDeclaringClass().equals(Throwable.class) + || (method.getDeclaringClass().equals(Throwable.class) + && !("getMessage".equals(method.getName()))) || !(method.getName().startsWith("get") || method.getName().startsWith("is"))) { return false;
