You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by mi...@apache.org on 2012/10/26 19:10:32 UTC

svn commit: r1402579 - in /jmeter/trunk: src/protocol/http/org/apache/jmeter/protocol/http/config/gui/HttpDefaultsGui.java xdocs/changes.xml

Author: milamber
Date: Fri Oct 26 17:10:31 2012
New Revision: 1402579

URL: http://svn.apache.org/viewvc?rev=1402579&view=rev
Log:
In HTTP Request Defaults, the value of field "Embedded URLs must match: is not saved if the check box "Retrieve All Embedded Resources" is not checked.
Bugzilla Id: 54058

Modified:
    jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/HttpDefaultsGui.java
    jmeter/trunk/xdocs/changes.xml

Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/HttpDefaultsGui.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/HttpDefaultsGui.java?rev=1402579&r1=1402578&r2=1402579&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/HttpDefaultsGui.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/HttpDefaultsGui.java Fri Oct 26 17:10:31 2012
@@ -87,14 +87,8 @@ public class HttpDefaultsGui extends Abs
         if (imageParser.isSelected()) {
             config.setProperty(new BooleanProperty(HTTPSamplerBase.IMAGE_PARSER, true));
             enableConcurrentDwn(true);
-            if(!StringUtils.isEmpty(embeddedRE.getText())) {
-                config.setProperty(new StringProperty(HTTPSamplerBase.EMBEDDED_URL_RE, embeddedRE.getText()));            
-            } else {
-                config.removeProperty(HTTPSamplerBase.EMBEDDED_URL_RE);
-            }
         } else {
             config.removeProperty(HTTPSamplerBase.IMAGE_PARSER);
-            config.removeProperty(HTTPSamplerBase.EMBEDDED_URL_RE);
             enableConcurrentDwn(false);
             
         }
@@ -112,6 +106,12 @@ public class HttpDefaultsGui extends Abs
         	config.setProperty(new StringProperty(HTTPSamplerBase.CONCURRENT_POOL,
         			String.valueOf(HTTPSamplerBase.CONCURRENT_POOL_SIZE)));
         }
+        if (!StringUtils.isEmpty(embeddedRE.getText())) {
+            config.setProperty(new StringProperty(HTTPSamplerBase.EMBEDDED_URL_RE,
+                    embeddedRE.getText()));
+        } else {
+            config.removeProperty(HTTPSamplerBase.EMBEDDED_URL_RE);
+        }
     }
 
     /**

Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1402579&r1=1402578&r2=1402579&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Fri Oct 26 17:10:31 2012
@@ -109,6 +109,7 @@ and right angle bracket (>) in search
 </ul>
 
 <h3>Timers, Assertions, Config, Pre- &amp; Post-Processors</h3>
+<li><bugzilla>54058</bugzilla> - In HTTP Request Defaults, the value of field "Embedded URLs must match: is not saved if the check box "Retrieve All  Embedded Resources" is not checked.</li>
 <ul>
 </ul>