Author: kkolinko
Date: Thu Nov 17 04:50:41 2011
New Revision: 1203047
URL: http://svn.apache.org/viewvc?rev=1203047&view=rev
Log:
Rearrange code. No functional change.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java
tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java?rev=1203047&r1=1203046&r2=1203047&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java Thu Nov 17
04:50:41 2011
@@ -64,10 +64,7 @@ public final class UDecoder {
}
// idx will be the smallest positive indexes ( first % or + )
- if( idx2 >= 0 && idx2 < idx ) {
- idx=idx2;
- }
- if( idx < 0 ) {
+ if( (idx2 >= 0 && idx2 < idx) || idx < 0 ) {
idx=idx2;
}
@@ -134,10 +131,7 @@ public final class UDecoder {
return;
}
- if( idx2 >= 0 && idx2 < idx ) {
- idx=idx2;
- }
- if( idx < 0 ) {
+ if( (idx2 >= 0 && idx2 < idx) || idx < 0 ) {
idx=idx2;
}
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=1203047&r1=1203046&r2=1203047&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java Thu Nov 17
04:50:41 2011
@@ -392,7 +392,7 @@ public final class Parameters {
if( urlDec==null ) {
urlDec=new UDecoder();
}
- urlDec.convert(bc);
+ urlDec.convert(bc, true);
}
public void processParameters( MessageBytes data, String encoding ) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
