From ff42d5ad54b2c7c8f1570addb14b4d7c477400ba Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Thu, 25 Sep 2014 16:52:09 +0200 Subject: [PATCH] CID-1211005: Fix comparison, Class is always instance of Class Signed-off-by: Rohit Yadav (cherry picked from commit 59482b3eba268570885d64dc9b0527a90cabbc07) --- server/src/com/cloud/event/ActionEventUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/com/cloud/event/ActionEventUtils.java b/server/src/com/cloud/event/ActionEventUtils.java index 68a328b8205..2ac43036c34 100755 --- a/server/src/com/cloud/event/ActionEventUtils.java +++ b/server/src/com/cloud/event/ActionEventUtils.java @@ -301,7 +301,7 @@ public class ActionEventUtils { try{ Object key = entry.getKey(); Class clz = Class.forName((String)key); - if(clz instanceof Class && Identity.class.isAssignableFrom(clz)){ + if(clz != null && Identity.class.isAssignableFrom(clz)){ String uuid = getEntityUuid(clz, entry.getValue()); eventDescription.put(ReflectUtil.getEntityName(clz), uuid); }