You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by wi...@apache.org on 2014/09/28 11:40:25 UTC

[25/50] [abbrv] git commit: updated refs/heads/statscollector-graphite to 621156c

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

Signed-off-by: Rohit Yadav <ro...@shapeblue.com>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/59482b3e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/59482b3e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/59482b3e

Branch: refs/heads/statscollector-graphite
Commit: 59482b3eba268570885d64dc9b0527a90cabbc07
Parents: b394680
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Thu Sep 25 16:52:09 2014 +0200
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Thu Sep 25 16:52:09 2014 +0200

----------------------------------------------------------------------
 server/src/com/cloud/event/ActionEventUtils.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/59482b3e/server/src/com/cloud/event/ActionEventUtils.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/event/ActionEventUtils.java b/server/src/com/cloud/event/ActionEventUtils.java
index 68a328b..2ac4303 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);
                 }