cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r826059 - in /cxf/branches/2.1.x-fixes: ./ common/common/src/main/java/org/apache/cxf/jaxb/JAXBUtils.java
Date Fri, 16 Oct 2009 20:01:11 GMT
Author: dkulp
Date: Fri Oct 16 20:01:10 2009
New Revision: 826059

URL: http://svn.apache.org/viewvc?rev=826059&view=rev
Log:
Merged revisions 826055 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/branches/2.2.x-fixes

................
  r826055 | dkulp | 2009-10-16 15:56:17 -0400 (Fri, 16 Oct 2009) | 9 lines
  
  Merged revisions 826054 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/trunk
  
  ........
    r826054 | dkulp | 2009-10-16 15:54:16 -0400 (Fri, 16 Oct 2009) | 1 line
    
    Fix problem I introduced with Java 5 (ran fine on Java 6)
  ........
................

Modified:
    cxf/branches/2.1.x-fixes/   (props changed)
    cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/jaxb/JAXBUtils.java

Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/jaxb/JAXBUtils.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/jaxb/JAXBUtils.java?rev=826059&r1=826058&r2=826059&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/jaxb/JAXBUtils.java
(original)
+++ cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/jaxb/JAXBUtils.java
Fri Oct 16 20:01:10 2009
@@ -577,15 +577,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