1 files changed, 18 insertions, 1 deletions
diff --git a/src/main/java/org/mockito/internal/junit/UniversalTestListener.java b/src/main/java/org/mockito/internal/junit/UniversalTestListener.java
index 66c9dee..f670c64 100644
--- a/src/main/java/org/mockito/internal/junit/UniversalTestListener.java
+++ b/src/main/java/org/mockito/internal/junit/UniversalTestListener.java
@@ -5,6 +5,7 @@
 package org.mockito.internal.junit;
 
 import org.mockito.internal.creation.settings.CreationSettings;
+import org.mockito.internal.listeners.AutoCleanableListener;
 import org.mockito.internal.util.MockitoLogger;
 import org.mockito.mock.MockCreationSettings;
 import org.mockito.quality.Strictness;
@@ -18,13 +19,14 @@ import java.util.Map;
  * Will come handy when we offer tweaking strictness at the method level with annotation.
  * Should be relatively easy to improve and offer tweaking strictness per mock.
  */
-public class UniversalTestListener implements MockitoTestListener {
+public class UniversalTestListener implements MockitoTestListener, AutoCleanableListener {
 
     private Strictness currentStrictness;
     private final MockitoLogger logger;
 
     private Map<Object, MockCreationSettings> mocks = new IdentityHashMap<Object, MockCreationSettings>();
     private DefaultStubbingLookupListener stubbingLookupListener;
+    private boolean listenerDirty;
 
     public UniversalTestListener(Strictness initialStrictness, MockitoLogger logger) {
         this.currentStrictness = initialStrictness;
@@ -85,4 +87,19 @@ public class UniversalTestListener implements MockitoTestListener {
         this.currentStrictness = strictness;
         this.stubbingLookupListener.setCurrentStrictness(strictness);
     }
+
+    /**
+     * See {@link AutoCleanableListener#isListenerDirty()}
+     */
+    @Override
+    public boolean isListenerDirty() {
+        return listenerDirty;
+    }
+
+    /**
+     * Marks listener as dirty, scheduled for cleanup when the next session starts
+     */
+    public void setListenerDirty() {
+        this.listenerDirty = true;
+    }
 }