Author: dkulp
Date: Mon Jan 28 16:44:33 2013
New Revision: 1439486
URL: http://svn.apache.org/viewvc?rev=1439486&view=rev
Log:
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.7.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
Modified:
cxf/branches/2.7.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java?rev=1439486&r1=1439485&r2=1439486&view=diff
==============================================================================
---
cxf/branches/2.7.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
(original)
+++
cxf/branches/2.7.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
Mon Jan 28 16:44:33 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;