Merge pull request #1616 from cky/actually-use-Java7ClassValue

headius · headius · commit 5ec626b0c436 · 2014-04-16T11:22:28.000-05:00
Actually use Java7ClassValue when using Java 7+.
diff --git a/core/src/main/java/org/jruby/javasupport/JavaSupport.java b/core/src/main/java/org/jruby/javasupport/JavaSupport.java
@@ -95,7 +95,7 @@ public IRubyObject allocateProxy(Object javaObject, RubyClass clazz) {
                 // try to load the ClassValue class. If it succeeds, we can use our
                 // ClassValue-based cache.
                 Class.forName("java.lang.ClassValue");
-                constructor = (Constructor<ClassValue>)Class.forName("org.jruby.java.proxies.ClassValueProxyCache").getConstructor(ClassValueCalculator.class);
+                constructor = (Constructor<ClassValue>)Class.forName("org.jruby.util.collections.Java7ClassValue").getConstructor(ClassValueCalculator.class);
             }
             catch (Exception ex) {
                 // fall through to Map version

Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ public IRubyObject allocateProxy(Object javaObject, RubyClass clazz) {`
`95`	`95`	`// try to load the ClassValue class. If it succeeds, we can use our`
`96`	`96`	`// ClassValue-based cache.`
`97`	`97`	`Class.forName("java.lang.ClassValue");`
`98`		`- constructor = (Constructor<ClassValue>)Class.forName("org.jruby.java.proxies.ClassValueProxyCache").getConstructor(ClassValueCalculator.class);`
	`98`	`+ constructor = (Constructor<ClassValue>)Class.forName("org.jruby.util.collections.Java7ClassValue").getConstructor(ClassValueCalculator.class);`
`99`	`99`	`}`
`100`	`100`	`catch (Exception ex) {`
`101`	`101`	`// fall through to Map version`