Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Bug-1520 Config subsystem:config-impl tests
[controller.git]
/
opendaylight
/
config
/
config-manager
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
config
/
manager
/
impl
/
osgi
/
ModuleFactoryBundleTracker.java
diff --git
a/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/osgi/ModuleFactoryBundleTracker.java
b/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/osgi/ModuleFactoryBundleTracker.java
index 05ca43c3e2d88e01ea9458fc15bc621a0cd9daa4..3015ed229e28f1c04015d9d488d641c9ebceb161 100644
(file)
--- a/
opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/osgi/ModuleFactoryBundleTracker.java
+++ b/
opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/osgi/ModuleFactoryBundleTracker.java
@@
-9,6
+9,7
@@
package org.opendaylight.controller.config.manager.impl.osgi;
import static java.lang.String.format;
import static java.lang.String.format;
+import com.google.common.annotations.VisibleForTesting;
import java.io.InputStream;
import java.net.URL;
import java.util.List;
import java.io.InputStream;
import java.net.URL;
import java.util.List;
@@
-70,9
+71,10
@@
public class ModuleFactoryBundleTracker implements BundleTrackerCustomizer<Objec
blankTransactionServiceTracker.blankTransaction();
}
blankTransactionServiceTracker.blankTransaction();
}
- // TODO:test
- pr
ivate
static ServiceRegistration<?> registerFactory(String factoryClassName, Bundle bundle) {
+ @VisibleForTesting
+ pr
otected
static ServiceRegistration<?> registerFactory(String factoryClassName, Bundle bundle) {
String errorMessage;
String errorMessage;
+ Exception ex = null;
try {
Class<?> clazz = bundle.loadClass(factoryClassName);
if (ModuleFactory.class.isAssignableFrom(clazz)) {
try {
Class<?> clazz = bundle.loadClass(factoryClassName);
if (ModuleFactory.class.isAssignableFrom(clazz)) {
@@
-86,10
+88,12
@@
public class ModuleFactoryBundleTracker implements BundleTrackerCustomizer<Objec
errorMessage = logMessage(
"Could not instantiate {} in bundle {}, reason {}",
factoryClassName, bundle, e);
errorMessage = logMessage(
"Could not instantiate {} in bundle {}, reason {}",
factoryClassName, bundle, e);
+ ex = e;
} catch (IllegalAccessException e) {
errorMessage = logMessage(
} catch (IllegalAccessException e) {
errorMessage = logMessage(
- "Illegal access during instatiation of class {} in bundle {}, reason {}",
+ "Illegal access during insta
n
tiation of class {} in bundle {}, reason {}",
factoryClassName, bundle, e);
factoryClassName, bundle, e);
+ ex = e;
}
} else {
errorMessage = logMessage(
}
} else {
errorMessage = logMessage(
@@
-98,10
+102,12
@@
public class ModuleFactoryBundleTracker implements BundleTrackerCustomizer<Objec
}
} catch (ClassNotFoundException e) {
errorMessage = logMessage(
}
} catch (ClassNotFoundException e) {
errorMessage = logMessage(
- "Could not find class {} in bunde {}, reason {}",
+ "Could not find class {} in bund
l
e {}, reason {}",
factoryClassName, bundle, e);
factoryClassName, bundle, e);
+ ex = e;
}
}
- throw new IllegalStateException(errorMessage);
+
+ throw ex == null ? new IllegalStateException(errorMessage) : new IllegalStateException(errorMessage, ex);
}
public static String logMessage(String slfMessage, Object... params) {
}
public static String logMessage(String slfMessage, Object... params) {