jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pmoua...@apache.org
Subject svn commit: r1575073 - in /jmeter/trunk: src/core/org/apache/jmeter/gui/util/TextAreaCellRenderer.java xdocs/changes.xml
Date Thu, 06 Mar 2014 22:20:32 GMT
Author: pmouawad
Date: Thu Mar  6 22:20:31 2014
New Revision: 1575073

URL: http://svn.apache.org/r1575073
Log:
Bug 56227 - AssertionGUI : NPE in assertion on mouse selection
Bugzilla Id: 56227

Modified:
    jmeter/trunk/src/core/org/apache/jmeter/gui/util/TextAreaCellRenderer.java
    jmeter/trunk/xdocs/changes.xml

Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/util/TextAreaCellRenderer.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/util/TextAreaCellRenderer.java?rev=1575073&r1=1575072&r2=1575073&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/util/TextAreaCellRenderer.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/util/TextAreaCellRenderer.java Thu Mar  6
22:20:31 2014
@@ -32,7 +32,11 @@ public class TextAreaCellRenderer implem
     public Component getTableCellRendererComponent(JTable table, Object value,
             boolean isSelected, boolean hasFocus,
             int row, int column) {
-        rend = new JTextArea(value.toString());
+        if(value != null) {
+            rend = new JTextArea(value.toString());
+        } else {
+            rend = new JTextArea();
+        }
         // Use two rows, so that we have room for horisontal scrollbar, if the text is one
long line. Fix for 40371
         // This is not an optimal solution, but makes it possible to see the line if it is
long
         rend.setRows(2);

Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1575073&r1=1575072&r2=1575073&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Thu Mar  6 22:20:31 2014
@@ -189,6 +189,7 @@ A workaround is to use a Java 7 update 4
 
 <h3>Timers, Assertions, Config, Pre- &amp; Post-Processors</h3>
 <ul>
+<li><bugzilla>56227</bugzilla> - AssertionGUI : NPE in assertion on mouse
selection</li>
 </ul>
 
 <h3>Functions</h3>



Mime
View raw message