Update 8756 server: fix NPE of unit test passEncRootPlannerHostSupportingEncryptionTest

weizhouapache · weizhouapache · commit 6fe3271661a9 · 2024-03-14T08:08:27.000+01:00
diff --git a/server/src/main/java/com/cloud/deploy/DeploymentPlanningManagerImpl.java b/server/src/main/java/com/cloud/deploy/DeploymentPlanningManagerImpl.java
@@ -2017,7 +2017,7 @@ public boolean postStateTransitionEvent(StateMachine2.Transition<State, Event> t
     }
 
     public static String logDeploymentWithoutException(VirtualMachine vm, DeploymentPlan plan, ExcludeList avoids, DeploymentPlanner planner) {
-        return LogUtils.logGsonWithoutException("Trying to deploy VM [%s] and details: Plan [%s]; avoid list [%s] and planner: [%s].", vm, plan, avoids, planner);
+        return LogUtils.logGsonWithoutException("Trying to deploy VM [%s] and details: Plan [%s]; avoid list [%s] and planner: [%s].", vm, plan, avoids, planner != null ? planner.getName() : null);
     }
     @Override
     public ConfigKey<?>[] getConfigKeys() {

Original file line number	Diff line number	Diff line change
`@@ -2017,7 +2017,7 @@ public boolean postStateTransitionEvent(StateMachine2.Transition<State, Event> t`
`2017`	`2017`	`}`
`2018`	`2018`
`2019`	`2019`	`public static String logDeploymentWithoutException(VirtualMachine vm, DeploymentPlan plan, ExcludeList avoids, DeploymentPlanner planner) {`
`2020`		`- return LogUtils.logGsonWithoutException("Trying to deploy VM [%s] and details: Plan [%s]; avoid list [%s] and planner: [%s].", vm, plan, avoids, planner);`
	`2020`	`+ return LogUtils.logGsonWithoutException("Trying to deploy VM [%s] and details: Plan [%s]; avoid list [%s] and planner: [%s].", vm, plan, avoids, planner != null ? planner.getName() : null);`
`2021`	`2021`	`}`
`2022`	`2022`	`@Override`
`2023`	`2023`	`public ConfigKey<?>[] getConfigKeys() {`