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 2012/08/24 14:02:49 UTC

svn commit: r1376890 - in /jmeter/trunk: src/components/org/apache/jmeter/visualizers/RequestViewRaw.java xdocs/changes.xml

Author: sebb
Date: Fri Aug 24 12:02:49 2012
New Revision: 1376890

URL: http://svn.apache.org/viewvc?rev=1376890&view=rev
Log:
RequestViewRaw does not show headers unless samplerData is non-null
Bugzilla Id: 53774

Modified:
    jmeter/trunk/src/components/org/apache/jmeter/visualizers/RequestViewRaw.java
    jmeter/trunk/xdocs/changes.xml

Modified: jmeter/trunk/src/components/org/apache/jmeter/visualizers/RequestViewRaw.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/RequestViewRaw.java?rev=1376890&r1=1376889&r2=1376890&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/visualizers/RequestViewRaw.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/visualizers/RequestViewRaw.java Fri Aug 24 12:02:49 2012
@@ -68,22 +68,22 @@ public class RequestViewRaw implements R
 
         if (objectResult instanceof SampleResult) {
             SampleResult sampleResult = (SampleResult) objectResult;
-            // load time label
+            String rh = sampleResult.getRequestHeaders();
+            StringBuilder sb = new StringBuilder();
             String sd = sampleResult.getSamplerData();
             if (sd != null) {
-                String rh = sampleResult.getRequestHeaders();
-                // Don't display Request headers label if rh is null or empty
-                if (rh != null && rh.length() > 0) {
-                    StringBuilder sb = new StringBuilder(sd.length()
-                            + rh.length() + 20);
-                    sb.append(sd);
-                    sb.append("\n"); //$NON-NLS-1$
-                    sb.append(JMeterUtils.getResString("view_results_request_headers")); //$NON-NLS-1$
-                    sb.append("\n"); //$NON-NLS-1$
-                    sb.append(rh);
-                    sd = sb.toString();
-                }
-                sampleDataField.setText(sd);
+                sb.append(sd);
+                sb.append("\n"); //$NON-NLS-1$
+            } 
+            // Don't display Request headers label if rh is null or empty
+            if (rh != null && rh.length() > 0) {
+                sb.append(JMeterUtils.getResString("view_results_request_headers")); //$NON-NLS-1$
+                sb.append("\n"); //$NON-NLS-1$
+                sb.append(rh);
+                sb.append("\n"); //$NON-NLS-1$
+            }
+            if (sb.length() > 0) {
+                sampleDataField.setText(sb.toString());
             } else {
                 // add a message when no request data (ex. Java request)
                 sampleDataField.setText(JMeterUtils

Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1376890&r1=1376889&r2=1376890&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Fri Aug 24 12:02:49 2012
@@ -97,6 +97,7 @@ Shortcut for Function Helper Dialog is n
 <h3>Listeners</h3>
 <ul>
 <li><bugzilla>53742</bugzilla> - When jmeter.save.saveservice.sample_count is set to true, elapsed time read by listener is always equal to 0</li>
+<li><bugzilla>53774</bugzilla> - RequestViewRaw does not show headers unless samplerData is non-null</li>
 </ul>
 
 <h3>Timers, Assertions, Config, Pre- &amp; Post-Processors</h3>