From 7aa44d94d1125074935a523303fe6f46eef70e14 Mon Sep 17 00:00:00 2001
From: tomoaki <tomoaki@tomy-tech.com>
Date: Thu, 3 Oct 2019 15:13:29 +0900
Subject: [PATCH] Bugfix of #165

Signed-off-by: tomoaki <tomoaki@tomy-tech.com>
---
 .../src/MQTTSNAggregateConnectionHandler.cpp   | 18 ++++++++----------
 .../src/MQTTSNGWConnectionHandler.cpp          | 18 +++++++-----------
 2 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/MQTTSNGateway/src/MQTTSNAggregateConnectionHandler.cpp b/MQTTSNGateway/src/MQTTSNAggregateConnectionHandler.cpp
index dded6df..4e84630 100644
--- a/MQTTSNGateway/src/MQTTSNAggregateConnectionHandler.cpp
+++ b/MQTTSNGateway/src/MQTTSNAggregateConnectionHandler.cpp
@@ -170,19 +170,17 @@ void MQTTSNAggregateConnectionHandler::handlePingreq(Client* client, MQTTSNPacke
 	    sendStoredPublish(client);
 		client->holdPingRequest();
 	}
-	else
-	{
-        /* create and send PINGRESP to the PacketHandler */
-	    client->resetPingRequest();
 
-        MQTTGWPacket* pingresp = new MQTTGWPacket();
+	/* create and send PINGRESP to the PacketHandler */
+	client->resetPingRequest();
 
-        pingresp->setHeader(PINGRESP);
+	MQTTGWPacket* pingresp = new MQTTGWPacket();
 
-        Event* evt = new Event();
-        evt->setBrokerRecvEvent(client, pingresp);
-        _gateway->getPacketEventQue()->post(evt);
-	}
+	pingresp->setHeader(PINGRESP);
+
+	Event* evt = new Event();
+	evt->setBrokerRecvEvent(client, pingresp);
+	_gateway->getPacketEventQue()->post(evt);
 }
 
 void MQTTSNAggregateConnectionHandler::sendStoredPublish(Client* client)
diff --git a/MQTTSNGateway/src/MQTTSNGWConnectionHandler.cpp b/MQTTSNGateway/src/MQTTSNGWConnectionHandler.cpp
index 33b3ef8..c73b517 100644
--- a/MQTTSNGateway/src/MQTTSNGWConnectionHandler.cpp
+++ b/MQTTSNGateway/src/MQTTSNGWConnectionHandler.cpp
@@ -275,18 +275,14 @@ void MQTTSNConnectionHandler::handlePingreq(Client* client, MQTTSNPacket* packet
 	if ( ( client->isSleep() || client->isAwake() ) &&  client->getClientSleepPacket() )
 	{
 	    sendStoredPublish(client);
-		client->holdPingRequest();
-	}
-	else
-	{
-        /* send PINGREQ to the broker */
-	    client->resetPingRequest();
-        MQTTGWPacket* pingreq = new MQTTGWPacket();
-        pingreq->setHeader(PINGREQ);
-        Event* evt = new Event();
-        evt->setBrokerSendEvent(client, pingreq);
-        _gateway->getBrokerSendQue()->post(evt);
 	}
+
+	/* send PINGREQ to the broker */
+	MQTTGWPacket* pingreq = new MQTTGWPacket();
+	pingreq->setHeader(PINGREQ);
+	Event* evt = new Event();
+	evt->setBrokerSendEvent(client, pingreq);
+	_gateway->getBrokerSendQue()->post(evt);
 }
 
 void MQTTSNConnectionHandler::sendStoredPublish(Client* client)