svn commit: r1809605 - in /jmeter/trunk: src/core/org/apache/jmeter/functions/gui/FunctionHelper.java xdocs/changes.xml

[pm...@apache.org]

Author: pmouawad
Date: Mon Sep 25 11:38:06 2017
New Revision: 1809605

URL: http://svn.apache.org/viewvc?rev=1809605&view=rev
Log:
Bug 61561 - Function helper dialog should display exception in result
Bugzilla Id: 61561

Modified:
    jmeter/trunk/src/core/org/apache/jmeter/functions/gui/FunctionHelper.java
    jmeter/trunk/xdocs/changes.xml

Modified: jmeter/trunk/src/core/org/apache/jmeter/functions/gui/FunctionHelper.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/functions/gui/FunctionHelper.java?rev=1809605&r1=1809604&r2=1809605&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/functions/gui/FunctionHelper.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/functions/gui/FunctionHelper.java Mon Sep 25 11:38:06 2017
@@ -38,9 +38,11 @@ import javax.swing.JRootPane;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 
+import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.apache.jmeter.config.Argument;
 import org.apache.jmeter.config.Arguments;
 import org.apache.jmeter.config.gui.ArgumentsPanel;
+import org.apache.jmeter.engine.ClientJMeterEngine;
 import org.apache.jmeter.engine.util.CompoundVariable;
 import org.apache.jmeter.functions.Function;
 import org.apache.jmeter.gui.action.ActionRouter;
@@ -56,10 +58,14 @@ import org.apache.jmeter.util.LocaleChan
 import org.apache.jorphan.gui.ComponentUtil;
 import org.apache.jorphan.gui.JLabeledChoice;
 import org.apache.jorphan.gui.JLabeledTextField;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class FunctionHelper extends JDialog implements ActionListener, ChangeListener, LocaleChangeListener {
     private static final long serialVersionUID = 240L;
 
+    private static final Logger log = LoggerFactory.getLogger(ClientJMeterEngine.class);
+
     private JLabeledChoice functionList;
 
     private ArgumentsPanel parameterPanel;
@@ -178,7 +184,14 @@ public class FunctionHelper extends JDia
         functionCall.append("}");
         cutPasteFunction.setText(functionCall.toString());
         CompoundVariable function = new CompoundVariable(functionCall.toString());
-        resultTextArea.setText(function.execute().trim()); 
+        try {
+            resultTextArea.setText(function.execute().trim());
+        } catch(Exception ex) {
+            log.error("Error calling function {}", functionCall.toString(), ex);
+            resultTextArea.setText(ex.getMessage() + ", \nstacktrace:\n "+
+                    ExceptionUtils.getStackTrace(ex));
+            resultTextArea.setCaretPosition(0);
+        }
     }
 
     private class HelpListener implements ActionListener {

Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1809605&r1=1809604&r2=1809605&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Mon Sep 25 11:38:06 2017
@@ -98,6 +98,7 @@ Summary
 
 <h3>Functions</h3>
 <ul>
+    <li><bug>61561</bug>Function helper dialog should display exception in result</li>
 </ul>
 
 <h3>I18N</h3>