Author: markt
Date: Tue May 22 19:44:56 2007
New Revision: 540813
URL: http://svn.apache.org/viewvc?view=rev&rev=540813
Log:
Port fix for bug 39875.
Fix genrics compiler warnings.
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/RealmBase.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/RealmBase.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/RealmBase.java?view=diff&rev=540813&r1=540812&r2=540813
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/RealmBase.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/RealmBase.java Tue May
22 19:44:56 2007
@@ -458,7 +458,7 @@
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 @@
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 @@
}
if(collection[j].findMethod(method)) {
if(results == null) {
- results = new ArrayList();
+ results = new ArrayList<SecurityConstraint>();
}
results.add(constraints[i]);
}
@@ -629,7 +629,7 @@
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 @@
}
if(matched) {
if(results == null) {
- results = new ArrayList();
+ results = new ArrayList<SecurityConstraint>();
}
results.add(constraints[i]);
}
@@ -691,7 +691,8 @@
/**
* 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 @@
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 ) {
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?view=diff&rev=540813&r1=540812&r2=540813
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Tue May 22 19:44:56 2007
@@ -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">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
