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 2012/09/11 20:54:01 UTC
svn commit: r1383540 - in
/cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/extension:
Extension.java Messages.properties
Author: dkulp
Date: Tue Sep 11 18:54:00 2012
New Revision: 1383540
URL: http://svn.apache.org/viewvc?rev=1383540&view=rev
Log:
Merged revisions 1383519 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes
........
r1383519 | dkulp | 2012-09-11 14:38:45 -0400 (Tue, 11 Sep 2012) | 10 lines
Merged revisions 1381621 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1381621 | dkulp | 2012-09-06 10:24:57 -0400 (Thu, 06 Sep 2012) | 2 lines
Better error messages if extension class can be loaded, but object cannot be instantiated
........
........
Modified:
cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/extension/Extension.java
cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/extension/Messages.properties
Modified: cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/extension/Extension.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/extension/Extension.java?rev=1383540&r1=1383539&r2=1383540&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/extension/Extension.java (original)
+++ cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/extension/Extension.java Tue Sep 11 18:54:00 2012
@@ -163,8 +163,8 @@ public class Extension {
return clazz;
}
public Object load(ClassLoader cl, Bus b) {
+ Class<?> cls = getClassObject(cl);
try {
- Class<?> cls = getClassObject(cl);
try {
//if there is a Bus constructor, use it.
if (b != null && args == null) {
@@ -198,9 +198,9 @@ public class Extension {
} catch (ExtensionException ex) {
throw ex;
} catch (IllegalAccessException ex) {
- throw new ExtensionException(ex);
+ throw new ExtensionException(new Message("PROBLEM_CREATING_EXTENSION_CLASS", LOG, cls.getName()), ex);
} catch (InstantiationException ex) {
- throw new ExtensionException(ex);
+ throw new ExtensionException(new Message("PROBLEM_CREATING_EXTENSION_CLASS", LOG, cls.getName()), ex);
}
return obj;
}
Modified: cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/extension/Messages.properties
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/extension/Messages.properties?rev=1383540&r1=1383539&r2=1383540&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/extension/Messages.properties (original)
+++ cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/extension/Messages.properties Tue Sep 11 18:54:00 2012
@@ -19,4 +19,5 @@
#
#
DEPRECATED_EXTENSIONS = Loading Bus extensions via {0} (found url {1}) is deprecated. Use {2} instead.
-PROBLEM_LOADING_EXTENSION_CLASS = Could not load extension class {0}.
\ No newline at end of file
+PROBLEM_LOADING_EXTENSION_CLASS = Could not load extension class {0}.
+PROBLEM_CREATING_EXTENSION_CLASS = Could not create object of extension class {0}.
\ No newline at end of file