Cache type but reset when object is set from Ruby.

Better fix for #4178.
jruby · Sep 28, 2016 · 37234e1 · 37234e1
1 parent 2481b86
commit 37234e1
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/core/src/main/java/org/jruby/embed/variable/AbstractVariable.java b/core/src/main/java/org/jruby/embed/variable/AbstractVariable.java
@@ -102,8 +102,7 @@ protected void updateByJavaObject(final Ruby runtime, Object... values) {
         } else if (values.length > 1) {
             javaType = (Class) values[1];
         } else {
-            // When a new object comes in without a target type, clear out cached type
-            javaType = null;
+            javaType = javaObject.getClass();
         }
         irubyObject = JavaEmbedUtils.javaToRuby(runtime, javaObject);
         fromRuby = false;
@@ -112,6 +111,7 @@ protected void updateByJavaObject(final Ruby runtime, Object... values) {
     protected void updateRubyObject(final IRubyObject rubyObject) {
         if ( rubyObject == null ) return;
         this.irubyObject = rubyObject;
+        this.javaType = null;
         // NOTE: quite weird - but won't pass tests otherwise !?!
         //this.javaObject = null;
         // delays updating javaObject for performance.
@@ -142,6 +142,9 @@ public Object getJavaObject() {
         }
         else { // Ruby originated variables
             javaObject = irubyObject.toJava(Object.class);
+            if (javaObject != null) {
+                javaType = javaObject.getClass();
+            }
         }
         return javaObject;
     }