svn commit: r1511654 - /jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/ConversionUtils.java

[pm...@apache.org]

Author: pmouawad
Date: Thu Aug  8 09:41:51 2013
New Revision: 1511654

URL: http://svn.apache.org/r1511654
Log:
Bug 54482 - HC fails to follow redirects with non-encoded chars
Clarify javadocs
Bugzilla Id: 54482

Modified:
    jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/ConversionUtils.java

Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/ConversionUtils.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/ConversionUtils.java?rev=1511654&r1=1511653&r2=1511654&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/ConversionUtils.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/ConversionUtils.java Thu Aug  8 09:41:51 2013
@@ -129,11 +129,11 @@ public class ConversionUtils {
     }
     
     /**
-     * Escapes reserved chars in a non-encoded URL.
-     * Warning: if the input URL has already been (partially) encoded, 
-     * the resulting URI will almost certainly be incorrect
-     * as the encoding character '%' will itself be re-encoded.
-     * @param url non-encoded URL
+     * Escapes reserved chars in a non-encoded URL or partially encoded one.
+     * Warning: it won't work on all unencoded URLs.
+     * For example, the unencoded URL http://localhost/% will cause an Exception.
+     * Any instances of % must have been encoded as %25 within the path portion.
+     * @param url non-encoded or partially encoded URL
      * @return URI which has been encoded as necessary
      * @throws URISyntaxException
      * @throws UnsupportedEncodingException