commit 653a16a49b83bd96b18ee71c8123f53305811472
author Ulf Adams <ulfjack@google.com> Thu Aug 11 12:39:46 2016 +0000
committer Yue Gan <yueg@google.com> Fri Aug 12 08:49:35 2016 +0000
tree 64a878f636aff27a4448caa5827a4b0852336093
parent 67ad82a319ff8959e69e774e7c15d3af904ec23d

Replace calls to <class>.newInstance with <class>.getConstructor().newInstance.

This is safer; newInstance on class objects bypasses exception checking.

--
MOS_MIGRATED_REVID=129976805

src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java

diff --git a/src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java b/src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java
index dc4920d..5a4ebd0 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java
@@ -527,7 +527,7 @@
     ImmutableList.Builder<BlazeModule> result = ImmutableList.builder();
     for (Class<? extends BlazeModule> moduleClass : moduleClasses) {
       try {
-        BlazeModule module = moduleClass.newInstance();
+        BlazeModule module = moduleClass.getConstructor().newInstance();
         result.add(module);
       } catch (Throwable e) {
         throw new IllegalStateException("Cannot instantiate module " + moduleClass.getName(), e);
@@ -782,11 +782,11 @@
       // gRPC server is not compiled in so that we don't need gRPC for bootstrapping.
       Class<?> factoryClass = Class.forName(
           "com.google.devtools.build.lib.server.GrpcServerImpl$Factory");
-      RPCServer.Factory factory = (RPCServer.Factory) factoryClass.newInstance();
+      RPCServer.Factory factory = (RPCServer.Factory) factoryClass.getConstructor().newInstance();
       return factory.create(commandExecutor, runtime.getClock(),
           startupOptions.commandPort, runtime.getServerDirectory(),
           startupOptions.maxIdleSeconds);
-    } catch (ClassNotFoundException | InstantiationException | IllegalAccessException e) {
+    } catch (ReflectiveOperationException | IllegalArgumentException e) {
       throw new AbruptExitException("gRPC server not compiled in", ExitCode.BLAZE_INTERNAL_ERROR);
     }
   }