Merge branch 'apache-3.1' into apache-3.2

apache · Mar 12, 2023 · 31635d5 · 31635d5
2 parents 179e1e7 + ffb2bbb
commit 31635d5
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/dubbo-common/src/test/java/org/apache/dubbo/rpc/model/ScopeModelUtilTest.java b/dubbo-common/src/test/java/org/apache/dubbo/rpc/model/ScopeModelUtilTest.java
@@ -25,6 +25,8 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
+import java.util.concurrent.locks.Lock;
+
 /**
  * {@link ScopeModelUtil}
  */
@@ -109,6 +111,11 @@ protected void onDestroy() {
         public Environment getModelEnvironment() {
             return null;
         }
+
+        @Override
+        protected Lock acquireDestroyLock() {
+            return null;
+        }
     }
 
 }