diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/DynamicOptions.java b/gerrit-server/src/main/java/com/google/gerrit/server/DynamicOptions.java
index 1d34415200..3759f09241 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/DynamicOptions.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/DynamicOptions.java
@@ -252,7 +252,7 @@ public class DynamicOptions {
     }
     if (mergedCl == null) {
       mergedCl = new DelegatingClassLoader(beanCl, dynamicBeanCl);
-      mergedClByCl.put(dynamicBeanCl, new WeakReference(mergedCl));
+      mergedClByCl.put(dynamicBeanCl, new WeakReference<>(mergedCl));
     }
     return mergedCl;
   }