up to 7.0.55; compile fails

[packages/tomcat.git] / tomcat-LDAPUserDatabase.patch

diff --git a/tomcat-LDAPUserDatabase.patch b/tomcat-LDAPUserDatabase.patch
index 6cef8bf82e357d9993de741de869e244aa72c35c..5a73ff55b41c4009895e8f62c1522d7879e6f4de 100644 (file)
--- a/tomcat-LDAPUserDatabase.patch
+++ b/tomcat-LDAPUserDatabase.patch
@@ -259,8 +259,8 @@ diff -urN apache-tomcat-6.0.29-src.orig/java/org/apache/catalina/startup/LDAPUse
 +
 +package org.apache.catalina.startup;
 +
-+import java.util.Hashtable;
 +import java.util.Enumeration;
++import java.util.Hashtable;
 +
 +import javax.naming.Context;
 +import javax.naming.NamingEnumeration;
@@ -301,7 +301,7 @@ diff -urN apache-tomcat-6.0.29-src.orig/java/org/apache/catalina/startup/LDAPUse
 +    /**
 +     * The set of home directories for all defined users, keyed by username.
 +     */
-+    private Hashtable homes = new Hashtable();
++    private Hashtable<String,String> homes = new Hashtable<String,String>();
 +
 +    /**
 +     * The UserConfig listener with which we are associated.
@@ -335,14 +335,14 @@ diff -urN apache-tomcat-6.0.29-src.orig/java/org/apache/catalina/startup/LDAPUse
 +     * @param user User for which a home directory should be retrieved
 +     */
 +    public String getHome(String user) {
-+        return ((String) homes.get(user));
++        return homes.get(user);
 +    }
 +
 +
 +    /**
 +     * Return an enumeration of the usernames defined on this server.
 +     */
-+    public Enumeration getUsers() {
++    public Enumeration<String> getUsers() {
 +        return (homes.keys());
 +    }
 +
@@ -431,7 +431,7 @@ diff -urN apache-tomcat-6.0.29-src.orig/java/org/apache/catalina/startup/LDAPUse
 +                      }
 +              } while ((cookie != null) && (cookie.length != 0));
 +      } catch (Exception e) {
-+      //        e.printStackTrace();
++              e.printStackTrace();
 +      }
 +    }
 +}