From cb0a93c49d1df29914ccce113e99de656c7660c7 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Erkka=20K=C3=A4=C3=A4ri=C3=A4?= <erkka.kaaria@intel.com>
Date: Thu, 12 Nov 2015 10:58:06 +0200
Subject: [PATCH] Add missing return statement
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

A non-void method in android jni wrapper was missing its return statement in
case an OCException was thrown.

Change-Id: Ic5651f3161e9387bdc8522d9509832337a938f23
Signed-off-by: Erkka Kääriä <erkka.kaaria@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4175
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Naga Ashok Jampani <jn.ashok@samsung.com>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
---
 android/android_api/base/jni/JniOcSecureResource.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/android/android_api/base/jni/JniOcSecureResource.cpp b/android/android_api/base/jni/JniOcSecureResource.cpp
index ee7e5e0..29e2ce8 100644
--- a/android/android_api/base/jni/JniOcSecureResource.cpp
+++ b/android/android_api/base/jni/JniOcSecureResource.cpp
@@ -566,6 +566,7 @@ JNIEXPORT jobject JNICALL Java_org_iotivity_base_OcSecureResource_getLinkedDevic
     {
         LOGE("%s", e.reason().c_str());
         ThrowOcException(e.code(), e.reason().c_str());
+        return nullptr;
     }
 }
 
-- 
2.7.4