PatchSet 4300
Date: 2004/01/09 16:45:56
Author: dalibor
Branch: HEAD
Tag: (none)
Log:
Resynced with GNU Classpath
2004-01-08 Dalibor Topic <[EMAIL PROTECTED]>
Resynced with GNU Classpath.
2004-01-06 Michael Koch <[EMAIL PROTECTED]>
* java/net/JarURLConnection.java
(JarURLConnection): Initialize entryName with null if no entry
present, fixed off by one error.
Members:
ChangeLog:1.1887->1.1888
libraries/javalib/java/net/JarURLConnection.java:1.3->1.4
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.1887 kaffe/ChangeLog:1.1888
--- kaffe/ChangeLog:1.1887 Thu Jan 8 18:06:15 2004
+++ kaffe/ChangeLog Fri Jan 9 16:45:56 2004
@@ -2,6 +2,16 @@
Resynced with GNU Classpath.
+ 2004-01-06 Michael Koch <[EMAIL PROTECTED]>
+
+ * java/net/JarURLConnection.java
+ (JarURLConnection): Initialize entryName with null if no entry
+ present, fixed off by one error.
+
+2004-01-08 Dalibor Topic <[EMAIL PROTECTED]>
+
+ Resynced with GNU Classpath.
+
2004-01-05 Sascha Brawer <[EMAIL PROTECTED]>
Fix for Classpath bug #6095
Index: kaffe/libraries/javalib/java/net/JarURLConnection.java
diff -u kaffe/libraries/javalib/java/net/JarURLConnection.java:1.3
kaffe/libraries/javalib/java/net/JarURLConnection.java:1.4
--- kaffe/libraries/javalib/java/net/JarURLConnection.java:1.3 Wed Oct 29 18:30:51
2003
+++ kaffe/libraries/javalib/java/net/JarURLConnection.java Fri Jan 9 16:45:58
2004
@@ -79,6 +79,13 @@
private final URL jarFileURL;
/**
+ * The connection to the jar file itself. A JarURLConnection
+ * can represent an entry in a jar file or an entire jar file. In
+ * either case this describes just the jar file itself.
+ */
+ protected URLConnection jarFileURLConnection;
+
+ /**
* This is the jar file "entry name" or portion after the "!/" in the
* URL which represents the pathname inside the actual jar file.
*/
@@ -110,7 +117,7 @@
jarFileURL = new URL (spec.substring (0, bang));
// Get the name of the entry, if any.
- entryName = spec.length() == (bang + 1) ? "" : spec.substring (bang + 2);
+ entryName = spec.length() == (bang + 2) ? null : spec.substring (bang + 2);
}
/**
_______________________________________________
kaffe mailing list
[EMAIL PROTECTED]
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
