Imported GNU Classpath 0.90
Imported GNU Classpath 0.90
* scripts/makemake.tcl: Set gnu/java/awt/peer/swing to ignore.
* gnu/classpath/jdwp/VMFrame.java (SIZE): New constant.
* java/lang/VMCompiler.java: Use gnu.java.security.hash.MD5.
* java/lang/Math.java: New override file.
* java/lang/Character.java: Merged from Classpath.
(start, end): Now 'int's.
(canonicalName): New field.
(CANONICAL_NAME, NO_SPACES_NAME, CONSTANT_NAME): New constants.
(UnicodeBlock): Added argument.
(of): New overload.
(forName): New method.
Updated unicode blocks.
(sets): Updated.
* sources.am: Regenerated.
* Makefile.in: Likewise.
From-SVN: r111942
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
/* Connection - jar url connection for java.net
|
||||
Copyright (C) 1999, 2002, 2003, 2005 Free Software Foundation, Inc.
|
||||
Copyright (C) 1999, 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
|
||||
|
||||
This file is part of GNU Classpath.
|
||||
|
||||
@@ -39,6 +39,7 @@ exception statement from your version. */
|
||||
package gnu.java.net.protocol.jar;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.FileNotFoundException;
|
||||
import java.io.FileOutputStream;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
@@ -145,7 +146,7 @@ public final class Connection extends JarURLConnection
|
||||
jar_entry = (JarEntry) jar_file.getEntry (entry_name);
|
||||
|
||||
if(jar_entry == null)
|
||||
throw new IOException ("No entry for " + entry_name + " exists.");
|
||||
throw new FileNotFoundException("No entry for " + entry_name + " exists.");
|
||||
}
|
||||
|
||||
connected = true;
|
||||
@@ -159,9 +160,6 @@ public final class Connection extends JarURLConnection
|
||||
if (! doInput)
|
||||
throw new ProtocolException("Can't open InputStream if doInput is false");
|
||||
|
||||
if (jar_entry == null)
|
||||
throw new IOException (jar_url + " couldn't be found.");
|
||||
|
||||
return jar_file.getInputStream (jar_entry);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user