From 839ef94ce926c78faa0f2b12a91666fa53d2e399 Mon Sep 17 00:00:00 2001 From: Kelven Yang Date: Thu, 29 May 2014 09:35:03 -0700 Subject: [PATCH] CLOUDSTACK-6970: Protect event interpretion from causing NPE exception (cherry picked from commit 06d8d3a03f7a4efc41c45d9f67fd5b7586a78454) Signed-off-by: Rohit Yadav --- server/src/com/cloud/api/ApiServer.java | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/server/src/com/cloud/api/ApiServer.java b/server/src/com/cloud/api/ApiServer.java index d78eaff139a..9041a5953e0 100755 --- a/server/src/com/cloud/api/ApiServer.java +++ b/server/src/com/cloud/api/ApiServer.java @@ -239,15 +239,20 @@ public class ApiServer extends ManagerBase implements HttpRequestHandler, ApiSer // Get the event type from the cmdInfo json string String info = job.getCmdInfo(); - String cmdEventType; - if (info == null) { - cmdEventType = "unknown"; - } else { + String cmdEventType = "unknown"; + if (info != null) { String marker = "\"cmdEventType\""; int begin = info.indexOf(marker); - cmdEventType = info.substring(begin + marker.length() + 2, info.indexOf(",", begin) - 1); - } + if (begin >= 0) { + cmdEventType = info.substring(begin + marker.length() + 2, info.indexOf(",", begin) - 1); + if (s_logger.isDebugEnabled()) + s_logger.debug("Retrieved cmdEventType from job info: " + cmdEventType); + } else { + if (s_logger.isDebugEnabled()) + s_logger.debug("Unable to locate cmdEventType marker in job info. publish as unknown event"); + } + } // For some reason, the instanceType / instanceId are not abstract, which means we may get null values. org.apache.cloudstack.framework.events.Event event = new org.apache.cloudstack.framework.events.Event( "management-server",