svn commit: r1776197 - /jmeter/trunk/src/core/org/apache/jmeter/util/BSFJavaScriptEngine.java

[pm...@apache.org]

Author: pmouawad
Date: Tue Dec 27 21:25:33 2016
New Revision: 1776197

URL: http://svn.apache.org/viewvc?rev=1776197&view=rev
Log:
Sonar : Fix false-positive and errors

Modified:
    jmeter/trunk/src/core/org/apache/jmeter/util/BSFJavaScriptEngine.java

Modified: jmeter/trunk/src/core/org/apache/jmeter/util/BSFJavaScriptEngine.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/util/BSFJavaScriptEngine.java?rev=1776197&r1=1776196&r2=1776197&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/util/BSFJavaScriptEngine.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/util/BSFJavaScriptEngine.java Tue Dec 27 21:25:33 2016
@@ -91,8 +91,8 @@ public class BSFJavaScriptEngine extends
                 retval = ((Wrapper) retval).unwrap();
             }
         }
-        catch (Throwable t) {
-            handleError(t); //NOSONAR We handle correctly Error case in function
+        catch (Throwable t) { //NOSONAR We handle correctly Error case in function
+            handleError(t);
         }
         finally {
             Context.exit();
@@ -145,8 +145,8 @@ public class BSFJavaScriptEngine extends
             }
 
         }
-        catch (Throwable t) { // includes JavaScriptException, rethrows Errors
-            handleError(t); // NOSONAR We handle correctly Error case in function
+        catch (Throwable t) { // NOSONAR We handle correctly Error case in function, includes JavaScriptException, rethrows Errors
+            handleError(t);
         }
         finally {
             Context.exit();
@@ -154,46 +154,49 @@ public class BSFJavaScriptEngine extends
         return retval;
     }
 
+    /**
+     * @param t {@link Throwable}
+     * @throws BSFException
+     */
     private void handleError(Throwable t) throws BSFException {
+        Throwable target = t;
         if (t instanceof WrappedException) {
-            t = ((WrappedException) t).getWrappedException();
+            target = ((WrappedException) t).getWrappedException();
         }
 
         String message = null;
-        Throwable target = t;
-
-        if (t instanceof JavaScriptException) {
-            message = t.getLocalizedMessage();
+        if (target instanceof JavaScriptException) {
+            message = target.getLocalizedMessage();
 
             // Is it an exception wrapped in a JavaScriptException?
-            Object value = ((JavaScriptException) t).getValue();
+            Object value = ((JavaScriptException) target).getValue();
             if (value instanceof Throwable) {
                 // likely a wrapped exception from a LiveConnect call.
                 // Display its stack trace as a diagnostic
                 target = (Throwable) value;
             }
         }
-        else if (t instanceof EvaluatorException ||
-                 t instanceof SecurityException) {
-            message = t.getLocalizedMessage();
+        else if (target instanceof EvaluatorException ||
+                target instanceof SecurityException) {
+            message = target.getLocalizedMessage();
         }
-        else if (t instanceof RuntimeException) {
-            message = "Internal Error: " + t.toString();
+        else if (target instanceof RuntimeException) {
+            message = "Internal Error: " + target.toString();
         }
-        else if (t instanceof StackOverflowError) {
+        else if (target instanceof StackOverflowError) {
             message = "Stack Overflow";
         }
 
         if (message == null) {
-            message = t.toString();
+            message = target.toString();
         }
 
-        if (t instanceof Error && !(t instanceof StackOverflowError)) {
+        if (target instanceof Error && !(target instanceof StackOverflowError)) {
             // Re-throw Errors because we're supposed to let the JVM see it
             // Don't re-throw StackOverflows, because we know we've
             // corrected the situation by aborting the loop and
             // a long stacktrace would end up on the user's console
-            throw (Error) t;
+            throw (Error) target;
         }
         else {
             throw new BSFException(BSFException.REASON_OTHER_ERROR,
@@ -227,8 +230,8 @@ public class BSFJavaScriptEngine extends
                 declareBean(declaredBean);
             }
         }
-        catch (Throwable t) {
-            handleError(t); // NOSONAR We handle correctly Error case in function
+        catch (Throwable t) { // NOSONAR We handle correctly Error case in function
+            handleError(t); 
         }
         finally {
             Context.exit();