Fix for the case that wrong number of args are given to constructor.

jruby · Jan 8, 2011 · ce516bd · ce516bd
1 parent 1b01bfb
commit ce516bd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/org/jruby/java/proxies/JavaProxy.java b/src/org/jruby/java/proxies/JavaProxy.java
@@ -69,7 +69,7 @@ public Object getObject() {
         // this resulted in object being null after unmarshalling...
         if (object == null) {
             if (javaObject == null) {
-                throw getRuntime().newRuntimeError("Java wrapper with no contents: " + this);
+                throw getRuntime().newRuntimeError("Java wrapper with no contents: " + this.getMetaClass().getName());
             } else {
                 object = javaObject.getValue();
             }

diff --git a/src/org/jruby/javasupport/Java.java b/src/org/jruby/javasupport/Java.java
@@ -469,9 +469,9 @@ public static RubyModule getProxyClass(Ruby runtime, JavaClass javaClass) {
                     Class<?>[] interfaces = c.getInterfaces();
                     for (int i = interfaces.length; --i >= 0;) {
                         JavaClass ifc = JavaClass.get(runtime, interfaces[i]);
-                        //if (interfaces[i] != java.util.Map.class) {
+                        if (interfaces[i] != java.util.Map.class) {
                             proxyClass.includeModule(getInterfaceModule(runtime, ifc));
-                        //}
+                        }
                     }
                     if (Modifier.isPublic(c.getModifiers())) {
                         addToJavaPackageModule(proxyClass, javaClass);