Merge pull request #67 from Shabirmean/IoTS-1.0.0-M1

Renaming sql files of Arduino and RPi

components/device-mgt-iot-virtualfirealarm/org.wso2.carbon.device.mgt.iot.virtualfirealarm.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/transport/VirtualFireAlarmXMPPConnector.java

@@ -70,6 +70,7 @@ public class VirtualFireAlarmXMPPConnector extends XmppConnector {
         int indexOfAt = from.indexOf("@");
         int indexOfSlash = from.indexOf("/");
 
+        if (indexOfAt != -1 && indexOfSlash != -1) {
             String deviceId = from.substring(0, indexOfAt);
             String owner = from.substring(indexOfSlash + 1, from.length());
 
@@ -97,7 +98,8 @@ public class VirtualFireAlarmXMPPConnector extends XmppConnector {
                         String tempVal = message.split(":")[1];
                         SensorDataManager.getInstance().setSensorRecord(deviceId,
                                                                         VirtualFireAlarmConstants.SENSOR_TEMPERATURE,
-                                                                    tempVal, Calendar.getInstance().getTimeInMillis());
+                                                                        tempVal,
+                                                                        Calendar.getInstance().getTimeInMillis());
                         break;
                     default:
                         if (log.isDebugEnabled()) {
@@ -106,6 +108,9 @@ public class VirtualFireAlarmXMPPConnector extends XmppConnector {
                         break;
                 }
             }
+        } else {
+            log.warn("Received XMPP message from client with unexpected JID [" + from + "].");
+        }
     }
 
     private void retryXMPPConnection() {