2 files changed, 12 insertions, 7 deletions

diff --git a/libjava/classpath/gnu/java/net/protocol/ftp/FTPConnection.java b/libjava/classpath/gnu/java/net/protocol/ftp/FTPConnection.java
index f5317d479bc..fd79019183a 100644
--- a/libjava/classpath/gnu/java/net/protocol/ftp/FTPConnection.java
+++ b/libjava/classpath/gnu/java/net/protocol/ftp/FTPConnection.java
@@ -1139,7 +1139,7 @@ public class FTPConnection
    * @param pathname the directory pathname, or null
    * @return a list of filenames(strings)
    */
-  public List nameList(String pathname)
+  public List<String> nameList(String pathname)
     throws IOException
   {
     if (dtp == null || transferMode == MODE_STREAM)
@@ -1164,7 +1164,7 @@ public class FTPConnection
         in = new BufferedInputStream(in);
         in = new CRLFInputStream(in);     // TODO ensure that TYPE is correct
         LineInputStream li = new LineInputStream(in);
-        List ret = new ArrayList();
+        ArrayList<String> ret = new ArrayList<String>();
         for (String line = li.readLine();
              line != null;
              line = li.readLine())
diff --git a/libjava/classpath/gnu/java/net/protocol/ftp/FTPURLConnection.java b/libjava/classpath/gnu/java/net/protocol/ftp/FTPURLConnection.java
index f937e51f606..cfad5a7c1a6 100644
--- a/libjava/classpath/gnu/java/net/protocol/ftp/FTPURLConnection.java
+++ b/libjava/classpath/gnu/java/net/protocol/ftp/FTPURLConnection.java
@@ -50,7 +50,9 @@ import java.net.InetAddress;
 import java.net.URL;
 import java.net.URLConnection;
 import java.security.AccessController;
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -112,7 +114,7 @@ public class FTPURLConnection
       {
         username = "anonymous";
         GetLocalHostAction a = new GetLocalHostAction();
-        InetAddress localhost =(InetAddress) AccessController.doPrivileged(a);
+        InetAddress localhost = AccessController.doPrivileged(a);
         password = SystemProperties.getProperty("user.name") + "@" +
           ((localhost == null) ? "localhost" : localhost.getHostName());
       }
@@ -232,9 +234,9 @@ public class FTPURLConnection
     return null;
   }
 
-  public Map getRequestProperties()
+  public Map<String, List<String>> getRequestProperties()
   {
-    Map map = new HashMap();
+    Map<String, List<String>> map = new HashMap<String, List<String>>();
     addRequestPropertyValue(map, "passive");
     addRequestPropertyValue(map, "representationType");
     addRequestPropertyValue(map, "fileStructure");
@@ -242,10 +244,13 @@ public class FTPURLConnection
     return map;
   }
 
-  private void addRequestPropertyValue(Map map, String key)
+  private void addRequestPropertyValue(Map<String, List<String>> map,
+                                       String key)
   {
     String value = getRequestProperty(key);
-    map.put(key, value);
+    ArrayList<String> l = new ArrayList<String>();
+    l.add(value);
+    map.put(key, l);
   }
   
   public void setRequestProperty(String key, String value)