From 0fee083c4b2205bf218f2e8ad21468dc00599c2b Mon Sep 17 00:00:00 2001
From: mharindu <milanharindu.ucsc@gmail.com>
Date: Wed, 18 May 2016 22:03:16 +0530
Subject: [PATCH] Added a null check to virtualfire-alarm

---
 .../service/impl/VirtualFireAlarmServiceImpl.java  | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/components/iot-plugins/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.api/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/VirtualFireAlarmServiceImpl.java b/components/iot-plugins/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.api/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/VirtualFireAlarmServiceImpl.java
index bc075f22c5..8af28181d2 100644
--- a/components/iot-plugins/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.api/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/VirtualFireAlarmServiceImpl.java
+++ b/components/iot-plugins/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.api/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/VirtualFireAlarmServiceImpl.java
@@ -62,6 +62,7 @@ import java.util.*;
 public class VirtualFireAlarmServiceImpl implements VirtualFireAlarmService {
 
     private static final String XMPP_PROTOCOL = "XMPP";
+    private static final String MQTT_PROTOCOL = "MQTT";
     private static final String KEY_TYPE = "PRODUCTION";
     private static ApiApplicationKey apiApplicationKey;
     private static Log log = LogFactory.getLog(VirtualFireAlarmServiceImpl.class);
@@ -70,13 +71,24 @@ public class VirtualFireAlarmServiceImpl implements VirtualFireAlarmService {
     @Path("device/{deviceId}/buzz")
     public Response switchBuzzer(@PathParam("deviceId") String deviceId, @QueryParam("protocol") String protocol,
                                  @FormParam("state") String state) {
+        if (state == null || state.isEmpty()) {
+            log.error("State is not defined for the buzzer operation");
+            return Response.status(Response.Status.BAD_REQUEST).build();
+        }
         String switchToState = state.toUpperCase();
         if (!switchToState.equals(VirtualFireAlarmConstants.STATE_ON) && !switchToState.equals(
                 VirtualFireAlarmConstants.STATE_OFF)) {
             log.error("The requested state change shoud be either - 'ON' or 'OFF'");
             return Response.status(Response.Status.BAD_REQUEST).build();
         }
-        String protocolString = protocol.toUpperCase();
+        String protocolString;
+
+        if (protocol == null || protocol.isEmpty()) {
+            protocolString = MQTT_PROTOCOL;
+        } else {
+            protocolString = protocol.toUpperCase();
+        }
+
         if (log.isDebugEnabled()) {
             log.debug("Sending request to switch-bulb of device [" + deviceId + "] via " +
                               protocolString);