[kaffe] CVS kaffe (dalibor): Resynced with GNU Classpath

[Kaffe CVS]

PatchSet 4302 
Date: 2004/01/09 17:56:34
Author: dalibor
Branch: HEAD
Tag: (none) 
Log:
Resynced with GNU Classpath

2004-01-09  Dalibor Topic <robilad at kaffe.org>

        Resynced with GNU Classpath.

        2004-01-06  Michael Koch  <konqueror at gmx.de>

        * java/net/URLConnection.java: Reformating.
        (getHeaderFields): Return empty map.
        (getPermission): Don't use package in class name.

Members: 
	ChangeLog:1.1889->1.1890 
	libraries/javalib/java/net/URLConnection.java:1.14->1.15 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.1889 kaffe/ChangeLog:1.1890
--- kaffe/ChangeLog:1.1889	Fri Jan  9 17:38:15 2004
+++ kaffe/ChangeLog	Fri Jan  9 17:56:34 2004
@@ -2,6 +2,16 @@
 
 	Resynced with GNU Classpath.
 
+	2004-01-06  Michael Koch  <konqueror at gmx.de>
+
+        * java/net/URLConnection.java: Reformating.
+        (getHeaderFields): Return empty map.
+        (getPermission): Don't use package in class name.
+
+2004-01-09  Dalibor Topic <robilad at kaffe.org>
+
+	Resynced with GNU Classpath.
+
 	2004-01-07  Michael Koch  <konqueror at gmx.de>
 
         * java/net/ServerSocket.java (isBound): Fixed documentation.
Index: kaffe/libraries/javalib/java/net/URLConnection.java
diff -u kaffe/libraries/javalib/java/net/URLConnection.java:1.14 kaffe/libraries/javalib/java/net/URLConnection.java:1.15
--- kaffe/libraries/javalib/java/net/URLConnection.java:1.14	Wed Dec 31 09:32:18 2003
+++ kaffe/libraries/javalib/java/net/URLConnection.java	Fri Jan  9 17:56:35 2004
@@ -41,6 +41,7 @@
 import java.io.InputStream;
 import java.io.IOException;
 import java.io.OutputStream;
+import java.security.AllPermission;
 import java.security.Permission;
 import java.util.Collections;
 import java.util.Date;
@@ -305,7 +306,7 @@
   public Map getHeaderFields()
   {
     // Subclasses for specific protocols override this.
-    return null;
+    return Collections.EMPTY_MAP;
   }
 
   /**
@@ -413,11 +414,12 @@
 
     // First try the factory
     ContentHandler ch = null;
+    
     if (factory != null)
       ch = factory.createContentHandler(type);
 
     if (ch != null)
-      return(ch.getContent(this));
+      return ch.getContent(this);
 
     // Then try our default class
     try
@@ -426,11 +428,12 @@
                                   type.replace('/', '.'));
      
         Object obj = cls.newInstance();
-        if (!(obj instanceof ContentHandler))
+        
+	if (! (obj instanceof ContentHandler))
           throw new UnknownServiceException(type);
 
-        ch = (ContentHandler)obj;
-        return(ch.getContent(this));
+        ch = (ContentHandler) obj;
+        return ch.getContent(this);
       }
     catch (ClassNotFoundException e)
       {
@@ -477,7 +480,7 @@
   public Permission getPermission() throws IOException
   {
     // Subclasses may override this.
-    return new java.security.AllPermission();
+    return new AllPermission();
   }
 
   /**