} with a binder.
*
@@ -147,7 +151,8 @@ public class DynamicSet implements Iterable {
try {
next = p.get();
} catch (RuntimeException e) {
- // TODO Log failed member of DynamicSet.
+ log.error("Cannot get iterated object from provider " + p
+ + ": object discared", e);
}
}
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/AutoRegisterModules.java b/gerrit-server/src/main/java/com/google/gerrit/server/plugins/AutoRegisterModules.java
index e8af06092c..b755349cd3 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/AutoRegisterModules.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/plugins/AutoRegisterModules.java
@@ -192,10 +192,12 @@ class AutoRegisterModules {
if (is("org.apache.sshd.server.Command", clazz)) {
if (sshGen != null) {
+ PluginLoader.log.info("Exporting " + clazz + " as SSH Command");
sshGen.export(export, clazz);
}
} else if (is("javax.servlet.http.HttpServlet", clazz)) {
if (httpGen != null) {
+ PluginLoader.log.info("Exporting " + clazz + " as HTTP Servlet");
httpGen.export(export, clazz);
listen(clazz, clazz);
}
@@ -247,6 +249,7 @@ class AutoRegisterModules {
TypeLiteral> tl = TypeLiteral.get(type);
if (env.hasDynamicSet(tl)) {
sysSingletons.add(clazz);
+ PluginLoader.log.info("Registering " + clazz + " to listener " + tl);
sysListen.put(tl, clazz);
} else if (env.hasDynamicMap(tl)) {
if (clazz.getAnnotation(Export.class) == null) {
@@ -255,6 +258,7 @@ class AutoRegisterModules {
clazz.getName(), rawType.getName()));
}
sysSingletons.add(clazz);
+ PluginLoader.log.info("Registering " + clazz + " to listener " + tl);
sysListen.put(tl, clazz);
} else {
throw new InvalidPluginException(String.format(