You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2010/11/17 22:11:27 UTC
svn commit: r1036227 - in /cxf/branches/2.3.x-fixes: ./
rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/AnnotationReader.java
Author: dkulp
Date: Wed Nov 17 21:11:27 2010
New Revision: 1036227
URL: http://svn.apache.org/viewvc?rev=1036227&view=rev
Log:
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.3.x-fixes/ (props changed)
cxf/branches/2.3.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/AnnotationReader.java
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.3.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.3.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/AnnotationReader.java?rev=1036227&r1=1036226&r2=1036227&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/AnnotationReader.java (original)
+++ cxf/branches/2.3.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/AnnotationReader.java Wed Nov 17 21:11:27 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;
}
}