[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[commit-cp] classpath ChangeLog gnu/java/net/IndexListParse...
From: |
Tom Tromey |
Subject: |
[commit-cp] classpath ChangeLog gnu/java/net/IndexListParse... |
Date: |
Wed, 14 Jun 2006 14:37:51 +0000 |
CVSROOT: /cvsroot/classpath
Module name: classpath
Changes by: Tom Tromey <tromey> 06/06/14 14:37:50
Modified files:
. : ChangeLog
gnu/java/net : IndexListParser.java
gnu/java/net/loader: JarURLLoader.java
Log message:
* gnu/java/net/loader/JarURLLoader.java (initialize): Skip our
own
jar.
* gnu/java/net/IndexListParser.java (IndexListParser): Call
clearAll
when index entry does not exist.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7811&r2=1.7812
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/net/IndexListParser.java?cvsroot=classpath&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/net/loader/JarURLLoader.java?cvsroot=classpath&r1=1.4&r2=1.5
Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7811
retrieving revision 1.7812
diff -u -b -r1.7811 -r1.7812
--- ChangeLog 14 Jun 2006 14:00:02 -0000 1.7811
+++ ChangeLog 14 Jun 2006 14:37:47 -0000 1.7812
@@ -1,3 +1,10 @@
+2006-06-14 Tom Tromey <address@hidden>
+
+ * gnu/java/net/loader/JarURLLoader.java (initialize): Skip our own
+ jar.
+ * gnu/java/net/IndexListParser.java (IndexListParser): Call clearAll
+ when index entry does not exist.
+
2006-06-14 Tania Bento <address@hidden>
* javax/swing/AbstractButton.java
Index: gnu/java/net/IndexListParser.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/net/IndexListParser.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- gnu/java/net/IndexListParser.java 19 May 2006 20:58:59 -0000 1.3
+++ gnu/java/net/IndexListParser.java 14 Jun 2006 14:37:50 -0000 1.4
@@ -125,7 +125,11 @@
br.close();
}
- // else INDEX.LIST does not exist
+ else
+ {
+ // INDEX.LIST does not exist
+ clearAll();
+ }
}
catch (Exception ex)
{
Index: gnu/java/net/loader/JarURLLoader.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/net/loader/JarURLLoader.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- gnu/java/net/loader/JarURLLoader.java 21 May 2006 11:35:08 -0000
1.4
+++ gnu/java/net/loader/JarURLLoader.java 14 Jun 2006 14:37:50 -0000
1.5
@@ -135,6 +135,11 @@
try
{
URL subURL = new URL(baseURL, e);
+ // We've seen at least one jar file whose Class-Path
+ // attribute includes the original jar. If we process
+ // that normally we end up with infinite recursion.
+ if (subURL.equals(baseURL))
+ continue;
JarURLLoader subLoader = new JarURLLoader(classloader,
cache, factory,
subURL, subURL);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [commit-cp] classpath ChangeLog gnu/java/net/IndexListParse...,
Tom Tromey <=