[Jython-checkins] SF.net SVN: jython:[5689] branches/newstyle-java-types/src/org/python/core/ PyJavaType.java

[<cg...@us...>]

Revision: 5689
          http://jython.svn.sourceforge.net/jython/?rev=5689&view=rev
Author:   cgroves
Date:     2008-12-04 01:27:28 +0000 (Thu, 04 Dec 2008)

Log Message:
-----------
Only add inner classes to the dict of a Java type if there isn't already something with that name.  Fixes test_cpickle

Modified Paths:
--------------
    branches/newstyle-java-types/src/org/python/core/PyJavaType.java

Modified: branches/newstyle-java-types/src/org/python/core/PyJavaType.java
===================================================================
--- branches/newstyle-java-types/src/org/python/core/PyJavaType.java	2008-12-04 01:10:43 UTC (rev 5688)
+++ branches/newstyle-java-types/src/org/python/core/PyJavaType.java	2008-12-04 01:27:28 UTC (rev 5689)
@@ -245,7 +245,10 @@
             dict.__setitem__("__init__", reflctr);
         }
         for (Class<?> inner : underlying_class.getClasses()) {
-            dict.__setitem__(inner.getSimpleName(), PyType.fromClass(inner));
+            // Only add the class if there isn't something else with that name
+            if (dict.__finditem__(inner.getSimpleName()) == null) {
+                dict.__setitem__(inner.getSimpleName(), PyType.fromClass(inner));
+            }
         }
         for (Map.Entry<Class<?>, PyBuiltinMethod[]> entry : getCollectionProxies().entrySet()) {
             if (entry.getKey() == underlying_class) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.