Author: dkulp Date: Wed Dec 19 18:52:04 2012 New Revision: 1424025 URL: http://svn.apache.org/viewvc?rev=1424025&view=rev Log: Merged revisions 1424008 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes
........ r1424008 | dkulp | 2012-12-19 13:28:50 -0500 (Wed, 19 Dec 2012) | 10 lines Merged revisions 1423982 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1423982 | dkulp | 2012-12-19 12:43:52 -0500 (Wed, 19 Dec 2012) | 2 lines [CXF-4708] Remove an unnessary cast that was failing in some cases ........ ........ Modified: cxf/branches/2.5.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/Utils.java Modified: cxf/branches/2.5.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/Utils.java URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/Utils.java?rev=1424025&r1=1424024&r2=1424025&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/Utils.java (original) +++ cxf/branches/2.5.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/Utils.java Wed Dec 19 18:52:04 2012 @@ -200,13 +200,13 @@ final class Utils { static Class<?> getFieldType(Field f) { XmlJavaTypeAdapter adapter = getFieldXJTA(f); - Class<?> adapterType = getTypeFromXmlAdapter(adapter); + Class<?> adapterType = (Class<?>)getTypeFromXmlAdapter(adapter); return adapterType != null ? adapterType : f.getType(); } static Class<?> getMethodReturnType(Method m) { XmlJavaTypeAdapter adapter = getMethodXJTA(m); - Class<?> adapterType = getTypeFromXmlAdapter(adapter); + Class<?> adapterType = (Class<?>)getTypeFromXmlAdapter(adapter); return adapterType != null ? adapterType : m.getReturnType(); } @@ -282,7 +282,7 @@ final class Utils { return adapter; } - static Class<?> getTypeFromXmlAdapter(XmlJavaTypeAdapter xjta) { + static Type getTypeFromXmlAdapter(XmlJavaTypeAdapter xjta) { if (xjta != null) { Class<?> c2 = xjta.value(); Type sp = c2.getGenericSuperclass(); @@ -291,7 +291,7 @@ final class Utils { c2 = c2.getSuperclass(); } if (sp instanceof ParameterizedType) { - return (Class<?>)((ParameterizedType)sp).getActualTypeArguments()[0]; + return ((ParameterizedType)sp).getActualTypeArguments()[0]; } } return null;
