Port fix for bug 39875.

Fix genrics compiler warnings.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@540813 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/realm/RealmBase.java b/java/org/apache/catalina/realm/RealmBase.java
index a184f52..7288b33 100644 (file)
--- a/java/org/apache/catalina/realm/RealmBase.java
+++ b/java/org/apache/catalina/realm/RealmBase.java
@@ -458,7 +458,7 @@ public abstract class RealmBase
     public SecurityConstraint [] findSecurityConstraints(Request request,
                                                          Context context) {
 
-        ArrayList results = null;
+        ArrayList<SecurityConstraint> results = null;
         // Are there any defined security constraints?
         SecurityConstraint constraints[] = context.findConstraints();
         if ((constraints == null) || (constraints.length == 0)) {
@@ -502,7 +502,7 @@ public abstract class RealmBase
                         found = true;
                         if(collection[j].findMethod(method)) {
                             if(results == null) {
-                                results = new ArrayList();
+                                results = new ArrayList<SecurityConstraint>();
                             }
                             results.add(constraints[i]);
                         }
@@ -571,7 +571,7 @@ public abstract class RealmBase
                     }
                     if(collection[j].findMethod(method)) {
                         if(results == null) {
-                            results = new ArrayList();
+                            results = new ArrayList<SecurityConstraint>();
                         }
                         results.add(constraints[i]);
                     }
@@ -629,7 +629,7 @@ public abstract class RealmBase
                 found = true;
                 if(collection[pos].findMethod(method)) {
                     if(results == null) {
-                        results = new ArrayList();
+                        results = new ArrayList<SecurityConstraint>();
                     }
                     results.add(constraints[i]);
                 }
@@ -673,7 +673,7 @@ public abstract class RealmBase
                 }
                 if(matched) {
                     if(results == null) {
-                        results = new ArrayList();
+                        results = new ArrayList<SecurityConstraint>();
                     }                    
                     results.add(constraints[i]);
                 }
@@ -691,7 +691,8 @@ public abstract class RealmBase
     /**
      * Convert an ArrayList to a SecurityContraint [].
      */
-    private SecurityConstraint [] resultsToArray(ArrayList results) {
+    private SecurityConstraint [] resultsToArray(
+            ArrayList<SecurityConstraint> results) {
         if(results == null) {
             return null;
         }
@@ -1327,8 +1328,12 @@ public abstract class RealmBase
     protected boolean initialized=false;
     
     public void init() {
-        this.containerLog = container.getLogger();
         if( initialized && container != null ) return;
+
+        // We want logger as soon as possible
+        if (container != null) {
+            this.containerLog = container.getLogger();
+        }
         
         initialized=true;
         if( container== null ) {

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 5f29218..b3a8c32 100644 (file)
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -34,6 +34,10 @@
          <bug>42401</bug>: Update RUNNING.txt with better JRE/JDK information.
          (markt)
       </fix>
+      <fix>
+         <bug>39875</bug>: Fix BPE in RealmBase.init(). Port of yoavs's fix from
+         Tomcat 5. (markt)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Jasper">