Fix merge forward bug (#8636)

vishesh92 · web-flow · commit 9b18243b876b · 2024-02-09T12:19:03.000+01:00
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
@@ -286,7 +286,7 @@ public boolean connectPhysicalDisk(String volumePath, KVMStoragePool pool, Map<S
             checkLinstorAnswersThrow(answers);
 
         } catch (ApiException apiEx) {
-            s_logger.error(apiEx);
+            logger.error(apiEx);
             throw new CloudRuntimeException(apiEx.getBestMessage(), apiEx);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -286,7 +286,7 @@ public boolean connectPhysicalDisk(String volumePath, KVMStoragePool pool, Map<S`
`286`	`286`	`checkLinstorAnswersThrow(answers);`
`287`	`287`
`288`	`288`	`} catch (ApiException apiEx) {`
`289`		`- s_logger.error(apiEx);`
	`289`	`+ logger.error(apiEx);`
`290`	`290`	`throw new CloudRuntimeException(apiEx.getBestMessage(), apiEx);`
`291`	`291`	`}`
`292`	`292`