You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2011/10/30 20:01:26 UTC
svn commit: r1195223 - in /tomcat/trunk:
java/org/apache/catalina/connector/Request.java
java/org/apache/tomcat/util/http/Parameters.java
test/org/apache/tomcat/util/http/TestParameters.java
Author: markt
Date: Sun Oct 30 19:01:25 2011
New Revision: 1195223
URL: http://svn.apache.org/viewvc?rev=1195223&view=rev
Log:
Simplify addition of parameters
Modified:
tomcat/trunk/java/org/apache/catalina/connector/Request.java
tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java
tomcat/trunk/test/org/apache/tomcat/util/http/TestParameters.java
Modified: tomcat/trunk/java/org/apache/catalina/connector/Request.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Request.java?rev=1195223&r1=1195222&r2=1195223&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/Request.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Request.java Sun Oct 30 19:01:25 2011
@@ -2524,13 +2524,13 @@ public class Request
if (encoding == null) {
encoding = Parameters.DEFAULT_ENCODING;
}
- parameters.addParameterValues(part.getName(),
- new String[] { part.getString(encoding) });
+ parameters.addParameter(part.getName(),
+ part.getString(encoding));
} catch (UnsupportedEncodingException uee) {
try {
- parameters.addParameterValues(part.getName(),
- new String[] {part.getString(
- Parameters.DEFAULT_ENCODING)});
+ parameters.addParameter(part.getName(),
+ part.getString(
+ Parameters.DEFAULT_ENCODING));
} catch (UnsupportedEncodingException e) {
// Should not be possible
}
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=1195223&r1=1195222&r2=1195223&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java Sun Oct 30 19:01:25 2011
@@ -99,6 +99,7 @@ public final class Parameters {
// Access to the current name/values, no side effect ( processing ).
// You must explicitly call handleQueryParameters and the post methods.
+ @Deprecated
public void addParameterValues(String key, String[] newValues) {
if (key == null) {
return;
@@ -171,7 +172,7 @@ public final class Parameters {
}
- private void addParam( String key, String value ) {
+ public void addParameter( String key, String value ) {
if( key==null ) {
return;
}
@@ -342,7 +343,7 @@ public final class Parameters {
value = tmpValue.toString();
}
- addParam(name, value);
+ addParameter(name, value);
} catch (IOException e) {
decodeFailCount++;
if (decodeFailCount == 1 || log.isDebugEnabled()) {
Modified: tomcat/trunk/test/org/apache/tomcat/util/http/TestParameters.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/http/TestParameters.java?rev=1195223&r1=1195222&r2=1195223&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/util/http/TestParameters.java (original)
+++ tomcat/trunk/test/org/apache/tomcat/util/http/TestParameters.java Sun Oct 30 19:01:25 2011
@@ -127,7 +127,8 @@ public class TestParameters {
assertNull(values);
// Add a parameter with two values
- p.addParameterValues("foo", new String[] {"value1", "value2"});
+ p.addParameter("foo", "value1");
+ p.addParameter("foo", "value2");
names = p.getParameterNames();
assertTrue(names.hasMoreElements());
@@ -140,7 +141,8 @@ public class TestParameters {
assertEquals("value2", values[1]);
// Add two more values
- p.addParameterValues("foo", new String[] {"value3", "value4"});
+ p.addParameter("foo", "value3");
+ p.addParameter("foo", "value4");
names = p.getParameterNames();
assertTrue(names.hasMoreElements());
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org