jython-checkins

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

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

Modified Files:
	CachedJarsPackageManager.java 
Log Message:
addJarToPackages(URL,File,boolean): Don't insert a JarXEntry object in the
hashtable if we don't create a .pkc file. The intention is to ensure that
the contents of packages.idx is in sync with the .pkc files.



Index: CachedJarsPackageManager.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/CachedJarsPackageManager.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** CachedJarsPackageManager.java	2001/10/28 17:13:42	1.10
--- CachedJarsPackageManager.java	2001/12/07 12:54:11	1.11
***************
*** 233,237 ****
                  entry = (JarXEntry)jarfiles.get(jarcanon);
  
!                 if (entry == null) {
                      message("processing new jar, '"+
                      jarcanon+"'");
--- 233,237 ----
                  entry = (JarXEntry)jarfiles.get(jarcanon);
  
!                 if (entry == null && cache) {
                      message("processing new jar, '"+
                      jarcanon+"'");
***************
*** 255,259 ****
  
  
!                 if (mtime != 0 && entry.mtime == mtime) {
                      zipPackages = readCacheFile(entry, jarcanon);
                  }
--- 255,259 ----
  
  
!                 if (mtime != 0 && entry != null && entry.mtime == mtime) {
                      zipPackages = readCacheFile(entry, jarcanon);
                  }