plenty of classes in the tank - use some of JRuby's instead of a dummy

minor improvement of class.count -1 for #4266's fix
jruby · Dec 17, 2016 · f17102c · f17102c · headius · Dec 18, 2016
1 parent 2398903
commit f17102c
Showing 3 changed files with 11 additions and 16 deletions.
diff --git a/core/src/main/java/org/jruby/javasupport/DummyForJavaUtil.java b/core/src/main/java/org/jruby/javasupport/DummyForJavaUtil.java
diff --git a/core/src/main/java/org/jruby/javasupport/Java.java b/core/src/main/java/org/jruby/javasupport/Java.java
@@ -1647,4 +1647,9 @@ static boolean isDefaultMethod(final Method method) {
         return false;
     }
 
+    /**
+     * @see JavaUtil#CAN_SET_ACCESSIBLE
+     */
+    @SuppressWarnings("unused") private static final byte _ = 72;
+
 }
diff --git a/core/src/main/java/org/jruby/javasupport/JavaUtil.java b/core/src/main/java/org/jruby/javasupport/JavaUtil.java
@@ -98,12 +98,13 @@ public class JavaUtil {
 
         if (RubyInstanceConfig.CAN_SET_ACCESSIBLE) {
             try {
-                // We want to check if we can access a commonly-existing private field through reflection. If so,
-                // we're probably able to access some other fields too later on.
-                Field f = DummyForJavaUtil.class.getDeclaredField("PRIVATE");
+                // We want to check if we can access a commonly-existing private field through reflection.
+                // If so, we're probably able to access some other fields too later on.
+                Field f = Java.class.getDeclaredField("_");
                 f.setAccessible(true);
-                canSetAccessible = f.get(null).equals(DummyForJavaUtil.PUBLIC);
-            } catch (Exception t) {
+                canSetAccessible = f.getByte(null) == 72;
+            }
+            catch (Exception t) {
                 // added this so if things are weird in the future we can debug without
                 // spinning a new binary
                 if (Options.JI_LOGCANSETACCESSIBLE.load()) {