handle null e.getMessage()

apache · Aug 21, 2020 · cc8068c · cc8068c
1 parent c2be3c9
commit cc8068c
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/AssignVMCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/AssignVMCmd.java
@@ -139,7 +139,13 @@ public void execute() {
             throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, e.getMessage());
         } catch (Exception e) {
             e.printStackTrace();
-            throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to move vm " + e.getMessage());
+            if (e.getMessage() != null) {
+                throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, String.format("Failed to move vm due to %s", this.getVmId(), e.getMessage()));
+            } else if (e.getCause() != null) {
+                throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, String.format("Failed to move vm due to %s", this.getVmId(), e.getCause()));
+            } else {
+                throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, String.format("Failed to move vm", this.getVmId()));
+            }
         }
 
     }