You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by se...@apache.org on 2013/09/11 01:08:16 UTC
svn commit: r1521677 - in /jmeter/trunk:
src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java
xdocs/changes.xml
Author: sebb
Date: Tue Sep 10 23:08:16 2013
New Revision: 1521677
URL: http://svn.apache.org/r1521677
Log:
HTTP Proxy Server GUI should not allow both Follow and Auto redirect to be selected
Bugzilla Id: 55545
Modified:
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java
jmeter/trunk/xdocs/changes.xml
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java?rev=1521677&r1=1521676&r2=1521677&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java Tue Sep 10 23:08:16 2013
@@ -345,6 +345,14 @@ public class ProxyControlGui extends Log
public void actionPerformed(ActionEvent action) {
String command = action.getActionCommand();
+ // Prevent both redirect types from being selected
+ final Object source = action.getSource();
+ if (source.equals(samplerFollowRedirects) && samplerFollowRedirects.isSelected()) {
+ samplerRedirectAutomatically.setSelected(false);
+ } else if (source.equals(samplerRedirectAutomatically) && samplerRedirectAutomatically.isSelected()) {
+ samplerFollowRedirects.setSelected(false);
+ }
+
// System.err.println(action.paramString()+" "+command+ "
// "+action.getModifiers());
Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1521677&r1=1521676&r2=1521677&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Tue Sep 10 23:08:16 2013
@@ -276,6 +276,7 @@ Previously the default was 1, which coul
<li><bugzilla>55502</bugzilla> - Proxy generates empty http:/ entries when recording</li>
<li><bugzilla>55504</bugzilla> - Proxy incorrectly issues CONNECT requests when browser prompts for certificate override</li>
<li><bugzilla>55506</bugzilla> - Proxy should deliver failed requests to any configured Listeners</li>
+<li><bugzilla>55545</bugzilla> - HTTP Proxy Server GUI should not allow both Follow and Auto redirect to be selected</li>
</ul>
<h3>Other Samplers</h3>