You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@jmeter.apache.org by pm...@apache.org on 2017/10/17 19:36:15 UTC

svn commit: r1812447 - /jmeter/trunk/src/core/org/apache/jmeter/gui/UndoHistory.java

Author: pmouawad
Date: Tue Oct 17 19:36:15 2017
New Revision: 1812447

URL: http://svn.apache.org/viewvc?rev=1812447&view=rev
Log:
Check if undo feature is enabled

Modified:
    jmeter/trunk/src/core/org/apache/jmeter/gui/UndoHistory.java

Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/UndoHistory.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/UndoHistory.java?rev=1812447&r1=1812446&r2=1812447&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/UndoHistory.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/UndoHistory.java Tue Oct 17 19:36:15 2017
@@ -310,6 +310,9 @@ public class UndoHistory implements Tree
     }
 
     void endUndoTransaction() {
+        if(!isEnabled()) {
+            return;
+        }
         if (!isTransaction()) {
             log.error("Undo transaction ended without beginning", new Exception());
             return;
@@ -322,7 +325,9 @@ public class UndoHistory implements Tree
     }
 
     void beginUndoTransaction() {
-        transactions.add(new SimpleCompoundEdit());
+        if(isEnabled()) {
+            transactions.add(new SimpleCompoundEdit());
+        }
     }
 
     boolean isTransaction() {