svn commit: r1776761 - /jmeter/trunk/src/components/org/apache/jmeter/assertions/BeanShellAssertion.java

[pm...@apache.org]

Author: pmouawad
Date: Sat Dec 31 14:45:50 2016
New Revision: 1776761

URL: http://svn.apache.org/viewvc?rev=1776761&view=rev
Log:
Sonar : fix squid:CommentedOutCodeLine "This block of commented-out lines of code should be removed. "
Also fix false positive on catching NoClassDefFoundError

Modified:
    jmeter/trunk/src/components/org/apache/jmeter/assertions/BeanShellAssertion.java

Modified: jmeter/trunk/src/components/org/apache/jmeter/assertions/BeanShellAssertion.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/assertions/BeanShellAssertion.java?rev=1776761&r1=1776760&r2=1776761&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/assertions/BeanShellAssertion.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/assertions/BeanShellAssertion.java Sat Dec 31 14:45:50 2016
@@ -109,14 +109,7 @@ public class BeanShellAssertion extends
                     .toString()));
             result.setError(false);
         }
-        /*
-         * To avoid class loading problems when the BSH jar is missing, we don't
-         * try to catch this error separately catch (bsh.EvalError ex) {
-         * log.debug("",ex); result.setError(true);
-         * result.setFailureMessage(ex.toString()); }
-         */
-        // but we do trap this error to make tests work better
-        catch (NoClassDefFoundError ex) {
+        catch (NoClassDefFoundError ex) { // NOSONAR explicitely trap this error to make tests work better 
             log.error("BeanShell Jar missing? " + ex.toString());
             result.setError(true);
             result.setFailureMessage("BeanShell Jar missing? " + ex.toString());