On 31/10/2011 22:52, Konstantin Kolinko wrote: > 2011/11/1 Mark Thomas <ma...@apache.org>: >> On 31/10/2011 15:46, kkoli...@apache.org wrote: >>> Author: kkolinko >>> Date: Mon Oct 31 15:46:36 2011 >>> New Revision: 1195531 >>> >>> URL: http://svn.apache.org/viewvc?rev=1195531&view=rev >>> Log: >>> Replace Hashtable with HashMap in parameter processing. >>> Improve paramsAsString() debug method by iterating over entries instead of >>> keys. >>> >>> Modified: >>> tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java >>> >>> Modified: tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java >>> URL: >>> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java?rev=1195531&r1=1195530&r2=1195531&view=diff >>> ============================================================================== >>> --- tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java (original) >>> +++ tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java Mon Oct >>> 31 15:46:36 2011 >>> @@ -21,8 +21,10 @@ import java.io.UnsupportedEncodingExcept >>> import java.nio.charset.Charset; >>> import java.util.ArrayList; >>> import java.util.Enumeration; >>> -import java.util.Hashtable; >>> +import java.util.HashMap; >>> +import java.util.Map; >>> >>> +import org.apache.catalina.util.Enumerator; >> >> -1 >> >> That import is not permitted. The o.a.tomcat package may not depend on >> o.a.catalina. You should have seen a checkstyle warning for that when >> you tried to build it. >> > > Maybe move that Enumerator class into org.apache.tomcat.util.collections ? > (Resurrecting the collections package)
That works for trunk. It would need to be a copy + deprecation for 7.0.x. > There are two copies of Enumerator class now: one in catalina and one in > jasper. Jasper will need to keep its own copy as it can't have any external dependencies. It would be good to get this fixed asap as I'd like to create the tag for 7.0.23 tomorrow. Mark --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
