commit e51a4d2793de5de37190192851556b9a2554b2cb
author Laurent Le Brun <laurentlb@google.com> Tue Oct 11 18:04:16 2016 +0000
committer Yue Gan <yueg@google.com> Wed Oct 12 08:55:50 2016 +0000
tree 46228dad254c1a2063ccf45195c1dddab464bf4f
parent 1171a7fb55ae9928cd976d4c3963f4874d58f60c

Automated cleanup

--
MOS_MIGRATED_REVID=135816105

src/main/java/com/google/devtools/build/lib/syntax/Runtime.java

diff --git a/src/main/java/com/google/devtools/build/lib/syntax/Runtime.java b/src/main/java/com/google/devtools/build/lib/syntax/Runtime.java
index 2795da1..f0608e6 100644
--- a/src/main/java/com/google/devtools/build/lib/syntax/Runtime.java
+++ b/src/main/java/com/google/devtools/build/lib/syntax/Runtime.java
@@ -21,13 +21,11 @@
 import com.google.devtools.build.lib.skylarkinterface.SkylarkValue;
 import com.google.devtools.build.lib.syntax.compiler.ByteCodeUtils;
 import com.google.devtools.build.lib.util.Preconditions;
-
-import net.bytebuddy.implementation.bytecode.StackManipulation;
-
 import java.lang.reflect.Field;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
+import net.bytebuddy.implementation.bytecode.StackManipulation;
 
 /**
  * Global constants and support for global namespaces of runtime functions.
@@ -182,7 +180,8 @@
     try {
       if (moduleClass.isAnnotationPresent(SkylarkModule.class)) {
         env.setup(
-            moduleClass.getAnnotation(SkylarkModule.class).name(), moduleClass.newInstance());
+            moduleClass.getAnnotation(SkylarkModule.class).name(),
+            moduleClass.getConstructor().newInstance());
       }
       for (Field field : moduleClass.getDeclaredFields()) {
         if (field.isAnnotationPresent(SkylarkSignature.class)) {
@@ -199,7 +198,7 @@
           }
         }
       }
-    } catch (IllegalAccessException | InstantiationException e) {
+    } catch (ReflectiveOperationException e) {
       throw new AssertionError(e);
     }
   }