From: Finn B. <bc...@us...> - 2001-07-04 01:39:31
|
Update of /cvsroot/jython/jython/org/python/core In directory usw-pr-cvs1:/tmp/cvs-serv8196 Modified Files: Py.java Log Message: findClass(), findClassEX(): Fix a NPE when a securitymanager prevents the creation of classloaders. Reported here: http://www.geocrawler.com/lists/3/SourceForge/7017/50/5924674/ Index: Py.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/core/Py.java,v retrieving revision 2.45 retrieving revision 2.46 diff -C2 -r2.45 -r2.46 *** Py.java 2001/06/22 18:55:56 2.45 --- Py.java 2001/07/03 20:20:27 2.46 *************** *** 577,581 **** secEnv=true; } ! return classLoader.loadClass(name); } --- 577,583 ---- secEnv=true; } ! if (classLoader != null) { ! return classLoader.loadClass(name); ! } } *************** *** 614,620 **** secEnv=true; } ! writeDebug("import", "trying " + name + " as " + reason + " in syspath loader"); ! return classLoader.loadClass(name); } --- 616,624 ---- secEnv=true; } ! if (classLoader != null) { ! writeDebug("import", "trying " + name + " as " + reason + " in syspath loader"); ! return classLoader.loadClass(name); ! } } |