[Easy-Setup] Fixed SVACE issues for Android [Mediator]

Change-Id: Ia0f3c0ec84e6129fafb8e4334b10b493977222b5
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/7525
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit 7444144fef76c258a0354781439d29487de89ed5)
Reviewed-on: https://gerrit.iotivity.org/gerrit/7539

diff --git a/service/easy-setup/mediator/richsdk/src/EnrolleeSecurity.cpp b/service/easy-setup/mediator/richsdk/src/EnrolleeSecurity.cpp
index 6d72009..0f35ce6 100755 (executable)
--- a/service/easy-setup/mediator/richsdk/src/EnrolleeSecurity.cpp
+++ b/service/easy-setup/mediator/richsdk/src/EnrolleeSecurity.cpp
@@ -80,6 +80,8 @@ namespace OIC
                 // returned by the security layer.
                 return list[i];
             }
+            OIC_LOG(ERROR, ENROLEE_SECURITY_TAG,"Error!!! DeviceList_t is NULL");
+            return NULL;
         }
 
         void EnrolleeSecurity::convertUUIDToString(OicUuid_t uuid, std::string& uuidString)
@@ -184,7 +186,6 @@ namespace OIC
                 ownershipStatus = DEVICE_NOT_OWNED;
                 //Throw exception
                 throw ESPlatformException(result);
-                return ownershipStatus;
             }
             else if (pUnownedDevList.size())
             {