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

[sebb]

Author: sebb
Date: Tue Nov 20 01:24:48 2012
New Revision: 1411496

URL: http://svn.apache.org/viewvc?rev=1411496&view=rev
Log:
ViewResultsTree could not render the HTML response: handle failure to parse HTML
Bugzilla Id: 54166

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

Modified: 
jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsHTML.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsHTML.java?rev=1411496&r1=1411495&r2=1411496&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsHTML.java 
(original)
+++ jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsHTML.java 
Tue Nov 20 01:24:48 2012
@@ -97,10 +97,13 @@ public class RenderAsHTML extends Sample
          */
         results.getDocument().putProperty("IgnoreCharsetDirective", 
Boolean.TRUE); // $NON-NLS-1$
 
-        results.setText(html);
+        try {
+            results.setText(html); // Bug can generate RTE
+        } catch (RuntimeException rte) {
+            results.setText("Failed to parse HTML: " + rte.getMessage());
+        }
         results.setCaretPosition(0);
         resultsScrollPane.setViewportView(results);
-
     }
 
     private static class LocalHTMLEditorKit extends HTMLEditorKit {

Modified: jmeter/trunk/xdocs/changes.xml
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1411496&r1=1411495&r2=1411496&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Tue Nov 20 01:24:48 2012
@@ -128,6 +128,7 @@ and right angle bracket (>) in search
 <h3>Listeners</h3>
 <ul>
 <li><bugzilla>54088</bugzilla> - The type video/f4m is text, not binary</li>
+<li><bugzilla>54166</bugzilla> - ViewResultsTree could not render the HTML 
response: handle failure to parse HTML</li>
 </ul>
 
 <h3>Timers, Assertions, Config, Pre- &amp; Post-Processors</h3>