2006-03-03 Wolfgang Baer <WBaer@gmx.de>

	* gnu/java/net/protocol/jar/Connection.java:
	(connect): Throw FileNotFoundException.
	(getInputStream): Remove duplicated code.

2 files changed, 9 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index c4b7085bf..34d9f95dc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-03-03  Wolfgang Baer  <WBaer@gmx.de>
+
+	* gnu/java/net/protocol/jar/Connection.java: 
+	(connect): Throw FileNotFoundException.
+	(getInputStream): Remove duplicated code.
+
 2006-03-03  Roman Kennke  <kennke@aicas.com>
 
 	* javax/swing/RepaintManager.java
diff --git a/gnu/java/net/protocol/jar/Connection.java b/gnu/java/net/protocol/jar/Connection.java
index e2a052ef5..41c5d6dcf 100644
--- a/gnu/java/net/protocol/jar/Connection.java
+++ b/gnu/java/net/protocol/jar/Connection.java
@@ -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);
   }