Author: klape Date: 2013-08-02 20:37:24 -0400 (Fri, 02 Aug 2013) New Revision: 17853 Modified: thirdparty/cxf/branches/cxf-2.2.12-patch-04_JBPAPP-10835/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBSchemaInitializer.java thirdparty/cxf/branches/cxf-2.2.12-patch-04_JBPAPP-10835/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/Utils.java Log: Fixing checkstyle errors Modified: thirdparty/cxf/branches/cxf-2.2.12-patch-04_JBPAPP-10835/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBSchemaInitializer.java =================================================================== --- thirdparty/cxf/branches/cxf-2.2.12-patch-04_JBPAPP-10835/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBSchemaInitializer.java 2013-08-03 00:09:58 UTC (rev 17852) +++ thirdparty/cxf/branches/cxf-2.2.12-patch-04_JBPAPP-10835/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBSchemaInitializer.java 2013-08-03 00:37:24 UTC (rev 17853) @@ -583,8 +583,8 @@ //we want to return the right type for collections so if we get null //from the return type we check if it's ParameterizedType and get the //generic return type. - if((type==null) && (m.getGenericReturnType() instanceof ParameterizedType)) { - type = m.getGenericReturnType(); + if ((type == null) && (m.getGenericReturnType() instanceof ParameterizedType)) { + type = m.getGenericReturnType(); } JAXBBeanInfo beanInfo = getBeanInfo(type); if (beanInfo != null) { Modified: thirdparty/cxf/branches/cxf-2.2.12-patch-04_JBPAPP-10835/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/Utils.java =================================================================== --- thirdparty/cxf/branches/cxf-2.2.12-patch-04_JBPAPP-10835/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/Utils.java 2013-08-03 00:09:58 UTC (rev 17852) +++ thirdparty/cxf/branches/cxf-2.2.12-patch-04_JBPAPP-10835/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/Utils.java 2013-08-03 00:37:24 UTC (rev 17853) @@ -209,17 +209,15 @@ } static Class<?> getMethodReturnType(Method m) { - XmlJavaTypeAdapter adapter = getMethodXJTA(m); - //if there is no adapter, yet we have a collection make sure - //we return the Generic type; if there is an annotation let the - //adapter handle what gets populated - if(adapter==null) { - if(m.getGenericReturnType() instanceof ParameterizedType) { - return null; - } - } - Class<?> adapterType = getTypeFromXmlAdapter(adapter); - return adapterType != null ? adapterType : m.getReturnType(); + XmlJavaTypeAdapter adapter = getMethodXJTA(m); + //if there is no adapter, yet we have a collection make sure + //we return the Generic type; if there is an annotation let the + //adapter handle what gets populated + if (adapter == null && m.getGenericReturnType() instanceof ParameterizedType) { + return null; + } + Class<?> adapterType = getTypeFromXmlAdapter(adapter); + return adapterType != null ? adapterType : m.getReturnType(); } @SuppressWarnings({ "rawtypes", "unchecked" })