From 296a44e932e5dfd529ac54bc52e865027c0b6e79 Mon Sep 17 00:00:00 2001 From: Nicolas Vazquez Date: Tue, 20 Aug 2024 10:26:41 -0300 Subject: [PATCH] Fix main branch issues (#9553) --- .../cloudstack/api/command/test/ImportRoleCmdTest.java | 6 ------ .../cloud/hypervisor/kvm/storage/LinstorStorageAdaptor.java | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/api/src/test/java/org/apache/cloudstack/api/command/test/ImportRoleCmdTest.java b/api/src/test/java/org/apache/cloudstack/api/command/test/ImportRoleCmdTest.java index 6299c1ed8e2..9f9b5ee6889 100644 --- a/api/src/test/java/org/apache/cloudstack/api/command/test/ImportRoleCmdTest.java +++ b/api/src/test/java/org/apache/cloudstack/api/command/test/ImportRoleCmdTest.java @@ -32,19 +32,13 @@ import org.springframework.test.util.ReflectionTestUtils; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyBoolean; -import static org.mockito.ArgumentMatchers.anyCollection; -import static org.mockito.ArgumentMatchers.anyList; import static org.mockito.ArgumentMatchers.anyString; -import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import com.cloud.exception.InvalidParameterValueException; -import java.util.ArrayList; import java.util.HashMap; -import java.util.List; import java.util.Map; -import java.util.regex.Matcher; public class ImportRoleCmdTest { private ImportRoleCmd importRoleCmd; diff --git a/plugins/storage/volume/linstor/src/main/java/com/cloud/hypervisor/kvm/storage/LinstorStorageAdaptor.java b/plugins/storage/volume/linstor/src/main/java/com/cloud/hypervisor/kvm/storage/LinstorStorageAdaptor.java index 971c2e8c9fd..5d037d63433 100644 --- a/plugins/storage/volume/linstor/src/main/java/com/cloud/hypervisor/kvm/storage/LinstorStorageAdaptor.java +++ b/plugins/storage/volume/linstor/src/main/java/com/cloud/hypervisor/kvm/storage/LinstorStorageAdaptor.java @@ -483,7 +483,7 @@ public class LinstorStorageAdaptor implements StorageAdaptor { } ); } } catch (ApiException apiExc) { - s_logger.error(apiExc.getMessage()); + logger.error(apiExc.getMessage()); } return false; }