Update of /cvsroot/jython/jython/org/python/core
In directory slayer.i.sourceforge.net:/tmp/cvs-serv16502
Modified Files:
PyClass.java
Log Message:
Removed the serializableProxies cache. It is no longer needed by the
PythonObjectInputStream. Also renamed all proxies to follow the format
org.python.proxies.<module>$<class>$<counter>.
Index: PyClass.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/PyClass.java,v
retrieving revision 2.14
retrieving revision 2.15
diff -C2 -r2.14 -r2.15
*** PyClass.java 2000/10/08 14:08:47 2.14
--- PyClass.java 2000/11/29 19:42:26 2.15
***************
*** 32,39 ****
public static PyClass __class__;
- // Store all proxies (by name) which implements Serializable.
- public static java.util.Hashtable serializableProxies =
- new java.util.Hashtable();
-
PyClass(boolean fakeArg) {
super(fakeArg);
--- 32,35 ----
***************
*** 68,72 ****
findModule(dict);
- boolean serializable = false;
if (proxyClass == null) {
--- 64,67 ----
***************
*** 76,81 ****
Class previousProxy = ((PyClass)bases.list[i]).getProxyClass();
if (previousProxy != null) {
- if (Serializable.class.isAssignableFrom(previousProxy))
- serializable = true;
if (previousProxy.isInterface()) {
interfaces.addElement(previousProxy);
--- 71,74 ----
***************
*** 93,105 ****
}
if (baseClass != null || interfaces.size() != 0) {
! String proxyName = __name__;
! if (serializable)
! proxyName = dict.__finditem__("__module__").toString() +
"$" + __name__;
proxyClass = MakeProxies.makeProxy(baseClass, interfaces,
proxyName, __dict__);
- if (serializable) {
- serializableProxies.put(proxyName, proxyClass);
- }
}
}
--- 86,93 ----
}
if (baseClass != null || interfaces.size() != 0) {
! String proxyName = dict.__finditem__("__module__").toString() +
"$" + __name__;
proxyClass = MakeProxies.makeProxy(baseClass, interfaces,
proxyName, __dict__);
}
}
|
