cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From h...@apache.org
Subject [37/44] git commit: updated refs/heads/vpc-toolkit-hugo to 1ad1883
Date Mon, 14 Jul 2014 13:37:41 GMT
Fixed code causing warnings in ActionEventUtils


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

Branch: refs/heads/vpc-toolkit-hugo
Commit: 7098367dc6d2b245e321546cae47e2c31c88b07a
Parents: bfb28da
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Authored: Wed Jul 9 10:50:07 2014 -0700
Committer: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Committed: Fri Jul 11 14:59:39 2014 -0700

----------------------------------------------------------------------
 server/src/com/cloud/event/ActionEventUtils.java | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7098367d/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 2b3cfea..68a328b 100755
--- a/server/src/com/cloud/event/ActionEventUtils.java
+++ b/server/src/com/cloud/event/ActionEventUtils.java
@@ -204,7 +204,7 @@ public class ActionEventUtils {
         String entityType = null;
         String entityUuid = null;
         CallContext context = CallContext.current();
-        Class entityKey = getEntityKey(eventType);
+        Class<?> entityKey = getEntityKey(eventType);
         if (entityKey != null){
             //FIXME - Remove this since it should be covered by the else if condition below.
             entityUuid = (String)context.getContextParameter(entityKey);
@@ -212,7 +212,7 @@ public class ActionEventUtils {
                 entityType = entityKey.getName();
         }else if (EventTypes.getEntityClassForEvent(eventType) != null){
             //Get entity Class(Example - VirtualMachine.class) from the event Type eg. -
VM.CREATE
-            Class entityClass = EventTypes.getEntityClassForEvent(eventType);
+            Class<?> entityClass = EventTypes.getEntityClassForEvent(eventType);
 
             //Get uuid from id
             if(context.getContextParameter(entityClass.getName()) != null){
@@ -260,7 +260,7 @@ public class ActionEventUtils {
         }
     }
 
-    private static String getEntityUuid(Class entityType, Object entityId){
+    private static String getEntityUuid(Class<?> entityType, Object entityId){
 
         // entityId can be internal db id or UUID so accordingly call findbyId or return
uuid directly
 
@@ -300,7 +300,7 @@ public class ActionEventUtils {
         for(Map.Entry<Object, Object> entry : contextMap.entrySet()){
             try{
                 Object key = entry.getKey();
-                Class clz = Class.forName((String)key);
+                Class<?> clz = Class.forName((String)key);
                 if(clz instanceof Class && Identity.class.isAssignableFrom(clz)){
                     String uuid = getEntityUuid(clz, entry.getValue());
                     eventDescription.put(ReflectUtil.getEntityName(clz), uuid);
@@ -312,7 +312,7 @@ public class ActionEventUtils {
 
     }
 
-    private static Class getEntityKey(String eventType)
+    private static Class<?> getEntityKey(String eventType)
     {
         // FIXME - Remove this
         if (eventType.startsWith("DOMAIN."))


Mime
View raw message