jython-checkins

[Finn B. <bc...@us...>]

Update of /cvsroot/jython/jython/org/python/core
In directory usw-pr-cvs1:/tmp/cvs-serv26685

Modified Files:
	PyJavaClass.java 
Log Message:
Fix [ #452947 ] Class of innerclass inst <> innerclas



Index: PyJavaClass.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/PyJavaClass.java,v
retrieving revision 2.36
retrieving revision 2.37
diff -C2 -d -r2.36 -r2.37
*** PyJavaClass.java	2001/08/14 19:43:14	2.36
--- PyJavaClass.java	2001/08/19 19:17:44	2.37
***************
*** 52,56 ****
          }
  
!         ret = new PyJavaClass(c);
          tbl.putCanonical(c,ret);
  
--- 52,60 ----
          }
  
!         Class parent = c.getDeclaringClass();
!         if (parent == null)
!             ret = new PyJavaClass(c);
!         else
!             ret = new PyJavaInnerClass(c, lookup(parent));
          tbl.putCanonical(c,ret);
  
***************
*** 809,813 ****
          if (innerClass == null) return null;
  
!         PyJavaClass jinner = new PyJavaInnerClass(innerClass, this);
          __dict__.__setitem__(name, jinner);
          return jinner;
--- 813,817 ----
          if (innerClass == null) return null;
  
!         PyJavaClass jinner = lookup(innerClass);
          __dict__.__setitem__(name, jinner);
          return jinner;