svn commit: r1037815 - in /cxf/branches/2.2.x-fixes: ./ rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/AnnotationReader.java

[dkulp]

Author: dkulp
Date: Mon Nov 22 18:19:23 2010
New Revision: 1037815

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

................
  r1036227 | dkulp | 2010-11-17 16:11:27 -0500 (Wed, 17 Nov 2010) | 9 lines
  
  Merged revisions 1036065 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/trunk
  
  ........
    r1036065 | bimargulies | 2010-11-17 09:38:44 -0500 (Wed, 17 Nov 2010) | 1 
line
    
    CXF-3130: just catch Throwable as per Dan's suggestion
  ........
................

Modified:
    cxf/branches/2.2.x-fixes/   (props changed)
    
cxf/branches/2.2.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/AnnotationReader.java

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

Modified: 
cxf/branches/2.2.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/AnnotationReader.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/AnnotationReader.java?rev=1037815&r1=1037814&r2=1037815&view=diff
==============================================================================
--- 
cxf/branches/2.2.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/AnnotationReader.java
 (original)
+++ 
cxf/branches/2.2.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/AnnotationReader.java
 Mon Nov 22 18:19:23 2010
@@ -420,11 +420,8 @@ public class AnnotationReader {
     private static Class<? extends Annotation> load(String name) {
         try {
             return 
AnnotationReader.class.getClassLoader().loadClass(name).asSubclass(Annotation.class);
-        } catch (ClassNotFoundException e) {
-            LOG.log(Level.WARNING, "Class " + name + " not found.", e);
-            return null;
-        } catch (ExceptionInInitializerError e2) {
-            LOG.log(Level.WARNING, "Initialization error loading " + name + " 
not found.", e2);
+        } catch (Throwable e) {
+            LOG.log(Level.WARNING, "Error loading annotation class " + name + 
".", e);
             return null;
         }
     }