Fix for JRUBY-702: no, we can't marshal Java objects, but we should p…

…resent a reasonable error rather than blow stack. git-svn-id: http://svn.codehaus.org/jruby/trunk/jruby@3720 961051c9-f516-0410-bf72-c9f7e237a7b7
aslakhellesoy · May 22, 2007 · 6019092 · 6019092
1 parent b31b395
commit 6019092
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/src/org/jruby/javasupport/JavaObject.java b/src/org/jruby/javasupport/JavaObject.java
@@ -42,6 +42,7 @@
 import org.jruby.runtime.Block;
 import org.jruby.runtime.CallbackFactory;
 import org.jruby.runtime.ObjectAllocator;
+import org.jruby.runtime.ObjectMarshal;
 import org.jruby.runtime.builtin.IRubyObject;
 
 /**
@@ -99,6 +100,8 @@ public static RubyClass createJavaObjectClass(Ruby runtime, RubyModule javaModul
 
         result.getMetaClass().undefineMethod("new");
         result.getMetaClass().undefineMethod("allocate");
+
+        result.setMarshal(ObjectMarshal.NOT_MARSHALABLE_MARSHAL);
 
         return result;
     }

diff --git a/test/test_higher_javasupport.rb b/test/test_higher_javasupport.rb
@@ -632,5 +632,9 @@ def test_lowercase_colon_package_syntax
     ci.addInterface1(LCTestB.new)
     ci.addInterface2(LCTestB.new)
   end
+
+  def test_marsal_java_object_fails
+    assert_raises(TypeError) { Marshal.dump(java::lang::Object.new) }
+  end
 end