From 75eafdd89648ba5abe46082df442a5efa9490182 Mon Sep 17 00:00:00 2001 From: jk13 Date: Fri, 6 Feb 2015 14:38:37 +0900 Subject: [PATCH] [SSM] Cleanup JNI dead code and add NDEBUG definition 1. Cleanup JNI dead code 2. Add NDEBUG definition to SCONS script to prevent crash when assert Change-Id: Ia4dc46548ce3bb0c9b4b28776e6c5f328444ab1a Signed-off-by: jk13 Reviewed-on: https://gerrit.iotivity.org/gerrit/314 Tested-by: jenkins-iotivity Reviewed-by: Uze Choi --- service/soft-sensor-manager/SConscript | 2 +- service/soft-sensor-manager/SSMCore/src/SSMInterface/SSMCore_JNI.cpp | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/service/soft-sensor-manager/SConscript b/service/soft-sensor-manager/SConscript index 0044431..6e12a76 100644 --- a/service/soft-sensor-manager/SConscript +++ b/service/soft-sensor-manager/SConscript @@ -20,7 +20,7 @@ if target_os == 'arduino': # Build flags ###################################################################### if target_os not in ['windows', 'winrt']: - soft_sensor_manager_env.AppendUnique(CXXFLAGS = ['-std=c++0x', '-Wall', '-DLINUX']) + soft_sensor_manager_env.AppendUnique(CXXFLAGS = ['-std=c++0x', '-Wall', '-DLINUX', '-DNDEBUG']) if target_os != 'android': soft_sensor_manager_env.AppendUnique(LIBS = ['pthread']) diff --git a/service/soft-sensor-manager/SSMCore/src/SSMInterface/SSMCore_JNI.cpp b/service/soft-sensor-manager/SSMCore/src/SSMInterface/SSMCore_JNI.cpp index 5c65d65..a8351c5 100644 --- a/service/soft-sensor-manager/SSMCore/src/SSMInterface/SSMCore_JNI.cpp +++ b/service/soft-sensor-manager/SSMCore/src/SSMInterface/SSMCore_JNI.cpp @@ -109,8 +109,6 @@ class QueryEngineEventReceiver env->GetMethodID(g_ClassQueryEngineEvent, "OnQueryEngineEvent", "(ILorg/iotivity/service/ssm/DataReader;)V"); - jclass callbackObject = env->GetObjectClass(m_objQueryEngineEvent); - jmethodID cid_DataReader = env->GetMethodID(g_ClassDataReader, "", "(I)V"); if (cid_DataReader == NULL) -- 2.7.4