cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r826054 - /cxf/trunk/common/common/src/main/java/org/apache/cxf/jaxb/JAXBUtils.java
Date Fri, 16 Oct 2009 19:54:16 GMT
Author: dkulp
Date: Fri Oct 16 19:54:16 2009
New Revision: 826054

URL: http://svn.apache.org/viewvc?rev=826054&view=rev
Log:
Fix problem I introduced with Java 5 (ran fine on Java 6)

Modified:
    cxf/trunk/common/common/src/main/java/org/apache/cxf/jaxb/JAXBUtils.java

Modified: cxf/trunk/common/common/src/main/java/org/apache/cxf/jaxb/JAXBUtils.java
URL: http://svn.apache.org/viewvc/cxf/trunk/common/common/src/main/java/org/apache/cxf/jaxb/JAXBUtils.java?rev=826054&r1=826053&r2=826054&view=diff
==============================================================================
--- cxf/trunk/common/common/src/main/java/org/apache/cxf/jaxb/JAXBUtils.java (original)
+++ cxf/trunk/common/common/src/main/java/org/apache/cxf/jaxb/JAXBUtils.java Fri Oct 16 19:54:16
2009
@@ -584,15 +584,17 @@
                                       Annotation anns[]) throws JAXBException {
         try {
             Class<?> cls;
+            Class<?> refClass;
             String pkg = "com.sun.xml.bind.";
             try {
                 cls = Class.forName("com.sun.xml.bind.api.JAXBRIContext");
+                refClass = Class.forName(pkg + "api.TypeReference");
             } catch (ClassNotFoundException e) {
                 // TODO Auto-generated catch block
                 cls = Class.forName("com.sun.xml.internal.bind.api.JAXBRIContext", true,
getXJCClassLoader());
                 pkg = "com.sun.xml.internal.bind.";
+                refClass = Class.forName(pkg + "api.TypeReference", true, getXJCClassLoader());
             }
-            Class<?> refClass = Class.forName(pkg + "api.TypeReference", true, getXJCClassLoader());
             Object ref = refClass.getConstructor(QName.class, 
                                                  Type.class, 
                                                  anns.getClass()).newInstance(qname, refcls,
anns);



Mime
View raw message