CID-1211005: Fix comparison, Class<?> is always instance of Class

yadvr · yadvr · commit 59482b3eba26 · 2014-09-25T16:52:09.000+02:00
Signed-off-by: Rohit Yadav &lt;rohit.yadav@shapeblue.com&gt;
diff --git a/server/src/com/cloud/event/ActionEventUtils.java b/server/src/com/cloud/event/ActionEventUtils.java
@@ -301,7 +301,7 @@ private static void populateFirstClassEntities(Map<String, String> eventDescript
             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);
                 }

Original file line number	Diff line number	Diff line change
`@@ -301,7 +301,7 @@ private static void populateFirstClassEntities(Map<String, String> eventDescript`
`301`	`301`	`try{`
`302`	`302`	`Object key = entry.getKey();`
`303`	`303`	`Class<?> clz = Class.forName((String)key);`
`304`		`- if(clz instanceof Class && Identity.class.isAssignableFrom(clz)){`
	`304`	`+ if(clz != null && Identity.class.isAssignableFrom(clz)){`
`305`	`305`	`String uuid = getEntityUuid(clz, entry.getValue());`
`306`	`306`	`eventDescription.put(ReflectUtil.getEntityName(clz), uuid);`
`307`	`307`	`}`