From 8d8f554271bd529675fb03b484960cd052783bd5 Mon Sep 17 00:00:00 2001
From: Stephane Lejeune <stlejeun@cisco.com>
Date: Tue, 8 Sep 2015 12:07:05 +0200
Subject: [PATCH] Fix regression on confirm-able messages.

MessageID should not be updated with the BlockID when the transfer is
not using the block-tranfer mechanism. This unnecessary update was
causing an error that prevented the pdu to be transmited normally.

Change-Id: I5927a636fb05f77fb2aa085e92b6f362e6e2a69e
Signed-off-by: Stephane Lejeune <stlejeun@cisco.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2402
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Hyuna Jo <hyuna0213.jo@samsung.com>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
---
 resource/csdk/connectivity/src/cablockwisetransfer.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/resource/csdk/connectivity/src/cablockwisetransfer.c b/resource/csdk/connectivity/src/cablockwisetransfer.c
index c534077..ebf02b6 100644
--- a/resource/csdk/connectivity/src/cablockwisetransfer.c
+++ b/resource/csdk/connectivity/src/cablockwisetransfer.c
@@ -1444,6 +1444,8 @@ CAResult_t CAAddBlockOption(coap_pdu_t **pdu, const CAInfo_t info,
         else
         {
             OIC_LOG(INFO, TAG, "not Blockwise Transfer");
+            CADestroyBlockID(blockDataID);
+            return CA_STATUS_OK;
         }
     }
 
-- 
2.7.4