fixed interval time in keepalive resource and logic to disconnect after sign up

Change-Id: I4cbf263f6ca2bfdc2614d3678b309aaa32dfe239
Signed-off-by: Jung Seungho <shonest.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19771
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Yeonghun Nam <yeonghun.nam@samsung.com>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>

diff --git a/cloud/interface/src/main/java/org/iotivity/cloud/ciserver/DeviceServerSystem.java b/cloud/interface/src/main/java/org/iotivity/cloud/ciserver/DeviceServerSystem.java
index d55cded..13d5cba 100644 (file)
--- a/cloud/interface/src/main/java/org/iotivity/cloud/ciserver/DeviceServerSystem.java
+++ b/cloud/interface/src/main/java/org/iotivity/cloud/ciserver/DeviceServerSystem.java
@@ -341,6 +341,11 @@ public class DeviceServerSystem extends ServerSystem {
 
                 switch (urlPath) {
 
+                    case OICConstants.ACCOUNT_FULL_URI:
+                        ctx.writeAndFlush(msg);
+                        ctx.close();
+                        return;
+
                     case OICConstants.ACCOUNT_SESSION_FULL_URI:
                         HashMap<String, Object> payloadData = mCbor
                                 .parsePayloadFromCbor(response.getPayload(),

diff --git a/cloud/interface/src/main/java/org/iotivity/cloud/ciserver/resources/KeepAliveResource.java b/cloud/interface/src/main/java/org/iotivity/cloud/ciserver/resources/KeepAliveResource.java
index 8e89806..9503358 100644 (file)
--- a/cloud/interface/src/main/java/org/iotivity/cloud/ciserver/resources/KeepAliveResource.java
+++ b/cloud/interface/src/main/java/org/iotivity/cloud/ciserver/resources/KeepAliveResource.java
@@ -114,8 +114,9 @@ public class KeepAliveResource extends Resource {
 
         checkPayloadException(Constants.REQ_PING, payloadData);
 
-        Long pingTime = Integer.valueOf(
-                payloadData.get(Constants.REQ_PING).toString()) * (long) 60000;
+        Long pingTime = (long) (Integer
+                .valueOf(payloadData.get(Constants.REQ_PING).toString())
+                * (long) 60000 * 1.1);
         Long connectionTime = System.currentTimeMillis() + pingTime;
         mConnectionPool.put(srcDevice, connectionTime);