2005-06-15 Goffredo Baroncelli <kreijack@inwind.it>

	PR libgcj/21074:
	* gnu/java/net/protocol/http/HTTPURLConnection.java
	(getHeaderFieldKey): Check index.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@100994 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 813eef1..d2653a4 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+2005-06-15  Goffredo Baroncelli  <kreijack@inwind.it>
+
+       PR libgcj/21074:
+       * gnu/java/net/protocol/http/HTTPURLConnection.java
+       (getHeaderFieldKey): Check index.
+
 2005-06-15  Tom Tromey  <tromey@redhat.com>
 
        PR libgcj/21906:

diff --git a/libjava/gnu/java/net/protocol/http/HTTPURLConnection.java b/libjava/gnu/java/net/protocol/http/HTTPURLConnection.java
index 50a6ed1..b82d30f 100644 (file)
--- a/libjava/gnu/java/net/protocol/http/HTTPURLConnection.java
+++ b/libjava/gnu/java/net/protocol/http/HTTPURLConnection.java
@@ -1,5 +1,5 @@
 /* HTTPURLConnection.java --
-   Copyright (C) 2004 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -572,6 +572,10 @@ public class HTTPURLConnection
     int count = 1;
     do
       {
+        if (!i.hasNext())
+          {
+            return null;
+          }
         entry = (Map.Entry) i.next();
         count++;
       }