jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pmoua...@apache.org
Subject svn commit: r1804340 - /jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterThread.java
Date Mon, 07 Aug 2017 14:24:56 GMT
Author: pmouawad
Date: Mon Aug  7 14:24:56 2017
New Revision: 1804340

URL: http://svn.apache.org/viewvc?rev=1804340&view=rev
Log:
Remove useless null testing

Modified:
    jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterThread.java

Modified: jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterThread.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterThread.java?rev=1804340&r1=1804339&r2=1804340&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterThread.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterThread.java Mon Aug  7 14:24:56
2017
@@ -1,4 +1,5 @@
 /*
+
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
@@ -433,7 +434,7 @@ public class JMeterThread implements Run
             if (log.isInfoEnabled()) {
                 log.info("Stopping Test: {}", e.toString());
             }
-            if (current != null && current instanceof TransactionSampler) {
+            if (current instanceof TransactionSampler) {
                 doEndTransactionSampler((TransactionSampler) current, parent, compiler.configureTransactionSampler((TransactionSampler)
current), threadContext);
             }
             shutdownTest();
@@ -441,7 +442,7 @@ public class JMeterThread implements Run
             if (log.isInfoEnabled()) {
                 log.info("Stopping Test with interruption of current samplers: {}", e.toString());
             }
-            if (current != null && current instanceof TransactionSampler) {
+            if (current instanceof TransactionSampler) {
                 doEndTransactionSampler((TransactionSampler) current, parent, compiler.configureTransactionSampler((TransactionSampler)
current), threadContext);
             }
             stopTestNow();
@@ -449,7 +450,7 @@ public class JMeterThread implements Run
             if (log.isInfoEnabled()) {
                 log.info("Stopping Thread: {}", e.toString());
             }
-            if (current != null && current instanceof TransactionSampler) {
+            if (current instanceof TransactionSampler) {
                 doEndTransactionSampler((TransactionSampler) current, parent, compiler.configureTransactionSampler((TransactionSampler)
current), threadContext);
             }
             stopThread();



Mime
View raw message