Author: tmancill Date: 2011-04-19 04:44:44 +0000 (Tue, 19 Apr 2011) New Revision: 13554
Added: trunk/tomcat6/debian/patches/0011-623242.patch Modified: trunk/tomcat6/debian/changelog trunk/tomcat6/debian/patches/series Log: apply upstream patch for #623242 Modified: trunk/tomcat6/debian/changelog =================================================================== --- trunk/tomcat6/debian/changelog 2011-04-18 04:55:23 UTC (rev 13553) +++ trunk/tomcat6/debian/changelog 2011-04-19 04:44:44 UTC (rev 13554) @@ -1,3 +1,12 @@ +tomcat6 (6.0.32-3) unstable; urgency=low + + * Team upload. + * Include upstream patch for ASF Bugzilla - Bug 50700 + (Context parameters are being overridden with parameters from the + web application deployment descriptor) (Closes: #623242) + + -- tony mancill <[email protected]> Mon, 18 Apr 2011 20:38:29 -0700 + tomcat6 (6.0.32-2) unstable; urgency=low * Team upload. Added: trunk/tomcat6/debian/patches/0011-623242.patch =================================================================== --- trunk/tomcat6/debian/patches/0011-623242.patch (rev 0) +++ trunk/tomcat6/debian/patches/0011-623242.patch 2011-04-19 04:44:44 UTC (rev 13554) @@ -0,0 +1,53 @@ +From: tony mancill <[email protected]> +Date: Mon Apr 18 20:44:47 PDT 2011 +Subject: Context parameters are being overridden with parameters from the web application deployment descriptor +Source: upstream, http://svn.apache.org/viewvc?view=revision&revision=1080224 +Bug: https://issues.apache.org/bugzilla/show_bug.cgi?id=50700 +Forwarded: not-needed + +--- a/java/org/apache/catalina/core/StandardContext.java 2011/03/10 13:52:10 1080223 ++++ b/java/org/apache/catalina/core/StandardContext.java 2011/03/10 13:52:41 1080224 +@@ -31,6 +31,7 @@ + import java.util.HashMap; + import java.util.Hashtable; + import java.util.Iterator; ++import java.util.Map; + import java.util.Stack; + import java.util.TreeMap; + +@@ -4805,23 +4806,29 @@ + * the application parameters appropriately. + */ + private void mergeParameters() { ++ Map<String,String> mergedParams = new HashMap<String,String>(); ++ + String names[] = findParameters(); + for (int i = 0; i < names.length; i++) { +- context.setInitParameter(names[i], findParameter(names[i])); ++ mergedParams.put(names[i], findParameter(names[i])); + } + + ApplicationParameter params[] = findApplicationParameters(); + for (int i = 0; i < params.length; i++) { + if (params[i].getOverride()) { +- if (context.getInitParameter(params[i].getName()) == null) { +- context.setInitParameter(params[i].getName(), ++ if (mergedParams.get(params[i].getName()) == null) { ++ mergedParams.put(params[i].getName(), + params[i].getValue()); + } + } else { +- context.setInitParameter(params[i].getName(), +- params[i].getValue()); ++ mergedParams.put(params[i].getName(), params[i].getValue()); + } + } ++ ++ for (Map.Entry<String,String> entry : mergedParams.entrySet()) { ++ context.setInitParameter(entry.getKey(), entry.getValue()); ++ } ++ + } + + + Modified: trunk/tomcat6/debian/patches/series =================================================================== --- trunk/tomcat6/debian/patches/series 2011-04-18 04:55:23 UTC (rev 13553) +++ trunk/tomcat6/debian/patches/series 2011-04-19 04:44:44 UTC (rev 13554) @@ -7,3 +7,4 @@ 0007-add-OSGi-headers-to-servlet-api.patch 0008-add-OSGI-headers-to-jsp-api.patch 0010-Use-java.security.policy-file-in-catalina.sh.patch +0011-623242.patch _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
