It also resets the event listeners to nullptr.
In addition it replaces all occurrences of NULL with nullptr
Change-Id: Ie0d80cc2e2312c6886e168ce7b0e4eaa9f84eac3
Signed-off-by: Tim Kourt <tim.a.kourt@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2356
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
{
jint ret;
JNIEnv *env = GetJNIEnv(ret);
- if (NULL == env)
+ if (nullptr == env)
{
return;
}
+
env->DeleteGlobalRef(m_jListener);
+ m_jListener = nullptr;
+
if (JNI_EDETACHED == ret)
{
g_jvm->DetachCurrentThread();
LOGD("JniEntityHandler_handleEntity");
jint envRet;
JNIEnv *env = GetJNIEnv(envRet);
- if (NULL == env)
+ if (nullptr == env)
{
return OC_EH_ERROR;
}
public:
T* addListener(JNIEnv* env, jobject jListener, JniOcResource* owner)
{
- T *onEventListener = NULL;
+ T *onEventListener = nullptr;
m_mapMutex.lock();
JniOnResourceFoundListener* AddOnResourceFoundListener(JNIEnv* env, jobject jListener)
{
- JniOnResourceFoundListener *onResourceFoundListener = NULL;
+ JniOnResourceFoundListener *onResourceFoundListener = nullptr;
resourceFoundMapLock.lock();
JniOnDeviceInfoListener* AddOnDeviceInfoListener(JNIEnv* env, jobject jListener)
{
- JniOnDeviceInfoListener *onDeviceInfoListener = NULL;
+ JniOnDeviceInfoListener *onDeviceInfoListener = nullptr;
deviceInfoMapLock.lock();
JniOnPlatformInfoListener* AddOnPlatformInfoListener(JNIEnv* env, jobject jListener)
{
- JniOnPlatformInfoListener *onPlatformInfoListener = NULL;
+ JniOnPlatformInfoListener *onPlatformInfoListener = nullptr;
platformInfoMapLock.lock();
JniOnPresenceListener* AddOnPresenceListener(JNIEnv* env, jobject jListener)
{
- JniOnPresenceListener *onPresenceListener = NULL;
+ JniOnPresenceListener *onPresenceListener = nullptr;
presenceMapLock.lock();
std::string dbfile;
if (jIpAddress)
{
- ipAddress = env->GetStringUTFChars(jIpAddress, NULL);
+ ipAddress = env->GetStringUTFChars(jIpAddress, nullptr);
}
if (jDbPath)
{
std::string host;
if (jHost)
{
- host = env->GetStringUTFChars(jHost, NULL);
+ host = env->GetStringUTFChars(jHost, nullptr);
}
std::string resourceUri;
if (jResourceUri)
{
- resourceUri = env->GetStringUTFChars(jResourceUri, NULL);
+ resourceUri = env->GetStringUTFChars(jResourceUri, nullptr);
}
if (!jListener)
{
std::string host;
if (jHost)
{
- host = env->GetStringUTFChars(jHost, NULL);
+ host = env->GetStringUTFChars(jHost, nullptr);
}
std::string resourceUri;
if (jResourceUri)
{
- resourceUri = env->GetStringUTFChars(jResourceUri, NULL);
+ resourceUri = env->GetStringUTFChars(jResourceUri, nullptr);
}
if (!jListener)
{
std::string host;
if (jHost)
{
- host = env->GetStringUTFChars(jHost, NULL);
+ host = env->GetStringUTFChars(jHost, nullptr);
}
std::string resourceUri;
if (jResourceUri)
{
- resourceUri = env->GetStringUTFChars(jResourceUri, NULL);
+ resourceUri = env->GetStringUTFChars(jResourceUri, nullptr);
}
if (!jListener)
{
std::string host;
if (jHost)
{
- host = env->GetStringUTFChars(jHost, NULL);
+ host = env->GetStringUTFChars(jHost, nullptr);
}
std::string resourceUri;
if (jResourceUri)
{
- resourceUri = env->GetStringUTFChars(jResourceUri, NULL);
+ resourceUri = env->GetStringUTFChars(jResourceUri, nullptr);
}
if (!jListener)
{
std::string host;
if (jHost)
{
- host = env->GetStringUTFChars(jHost, NULL);
+ host = env->GetStringUTFChars(jHost, nullptr);
}
std::string resourceUri;
if (jResourceUri)
{
- resourceUri = env->GetStringUTFChars(jResourceUri, NULL);
+ resourceUri = env->GetStringUTFChars(jResourceUri, nullptr);
}
if (!jListener)
{
std::string host;
if (jHost)
{
- host = env->GetStringUTFChars(jHost, NULL);
+ host = env->GetStringUTFChars(jHost, nullptr);
}
std::string resourceUri;
if (jResourceUri)
{
- resourceUri = env->GetStringUTFChars(jResourceUri, NULL);
+ resourceUri = env->GetStringUTFChars(jResourceUri, nullptr);
}
if (!jListener)
{
std::string resourceUri;
if (jResourceUri)
{
- resourceUri = env->GetStringUTFChars(jResourceUri, NULL);
+ resourceUri = env->GetStringUTFChars(jResourceUri, nullptr);
}
std::string resourceTypeName;
if (jResourceTypeName)
{
- resourceTypeName = env->GetStringUTFChars(jResourceTypeName, NULL);
+ resourceTypeName = env->GetStringUTFChars(jResourceTypeName, nullptr);
}
std::string resourceInterface;
if (jResourceInterface)
{
- resourceInterface = env->GetStringUTFChars(jResourceInterface, NULL);
+ resourceInterface = env->GetStringUTFChars(jResourceInterface, nullptr);
}
JniEntityHandler* entityHandler = NULL;
EntityHandler handleEntityCallback = NULL;
std::string deviceName;
if (jDeviceName)
{
- deviceName = env->GetStringUTFChars(jDeviceName, NULL);
+ deviceName = env->GetStringUTFChars(jDeviceName, nullptr);
}
OCDeviceInfo deviceInfo;
if (jPlatformID)
{
- platformID = env->GetStringUTFChars(jPlatformID, NULL);
+ platformID = env->GetStringUTFChars(jPlatformID, nullptr);
}
if (jManufacturerName)
{
- manufacturerName = env->GetStringUTFChars(jManufacturerName, NULL);
+ manufacturerName = env->GetStringUTFChars(jManufacturerName, nullptr);
}
if (jManufacturerUrl)
{
- manufacturerUrl = env->GetStringUTFChars(jManufacturerUrl, NULL);
+ manufacturerUrl = env->GetStringUTFChars(jManufacturerUrl, nullptr);
}
if (jModelNumber)
{
- modelNumber = env->GetStringUTFChars(jModelNumber, NULL);
+ modelNumber = env->GetStringUTFChars(jModelNumber, nullptr);
}
if (jDateOfManufacture)
{
- dateOfManufacture = env->GetStringUTFChars(jDateOfManufacture, NULL);
+ dateOfManufacture = env->GetStringUTFChars(jDateOfManufacture, nullptr);
}
if (jPlatformVersion)
{
- platformVersion = env->GetStringUTFChars(jPlatformVersion, NULL);
+ platformVersion = env->GetStringUTFChars(jPlatformVersion, nullptr);
}
if (jOperatingSystemVersion)
{
- operatingSystemVersion = env->GetStringUTFChars(jOperatingSystemVersion, NULL);
+ operatingSystemVersion = env->GetStringUTFChars(jOperatingSystemVersion, nullptr);
}
if (jHardwareVersion)
{
- hardwareVersion = env->GetStringUTFChars(jHardwareVersion, NULL);
+ hardwareVersion = env->GetStringUTFChars(jHardwareVersion, nullptr);
}
if (jFirmwareVersion)
{
- firmwareVersion = env->GetStringUTFChars(jFirmwareVersion, NULL);
+ firmwareVersion = env->GetStringUTFChars(jFirmwareVersion, nullptr);
}
if (jSupportUrl)
{
- supportUrl = env->GetStringUTFChars(jSupportUrl, NULL);
+ supportUrl = env->GetStringUTFChars(jSupportUrl, nullptr);
}
if (jSystemTime)
{
- systemTime = env->GetStringUTFChars(jSystemTime, NULL);
+ systemTime = env->GetStringUTFChars(jSystemTime, nullptr);
}
OCPlatformInfo platformInfo;
std::string typeName;
if (jResourceTypeName)
{
- typeName = env->GetStringUTFChars(jResourceTypeName, NULL);
+ typeName = env->GetStringUTFChars(jResourceTypeName, nullptr);
}
JniOcResourceHandle* jniOcResourceHandle =
std::string interfaceName;
if (jResourceInterfaceName)
{
- interfaceName = env->GetStringUTFChars(jResourceInterfaceName, NULL);
+ interfaceName = env->GetStringUTFChars(jResourceInterfaceName, nullptr);
}
JniOcResourceHandle* jniOcResourceHandle =
std::string host;
if (jHost)
{
- host = env->GetStringUTFChars(jHost, NULL);
+ host = env->GetStringUTFChars(jHost, nullptr);
}
if (!jListener)
{
std::string host;
if (jHost)
{
- host = env->GetStringUTFChars(jHost, NULL);
+ host = env->GetStringUTFChars(jHost, nullptr);
}
std::string resourceType;
if (jResourceType)
{
- resourceType = env->GetStringUTFChars(jResourceType, NULL);
+ resourceType = env->GetStringUTFChars(jResourceType, nullptr);
}
if (!jListener)
{
std::string host;
if (jHost)
{
- host = env->GetStringUTFChars(jHost, NULL);
+ host = env->GetStringUTFChars(jHost, nullptr);
}
std::string uri;
if (jUri)
{
- uri = env->GetStringUTFChars(jUri, NULL);
+ uri = env->GetStringUTFChars(jUri, nullptr);
}
if (!jResourceTypeArray)
{
OCRepresentation *rep = JniOcRepresentation::getOCRepresentationPtr(env, thiz);
if (!rep) return nullptr;
- std::string key = env->GetStringUTFChars(jKey, NULL);
+ std::string key = env->GetStringUTFChars(jKey, nullptr);
AttributeValue attrValue;
if (!rep->getAttributeValue(key.c_str(), attrValue))
OCRepresentation *rep = JniOcRepresentation::getOCRepresentationPtr(env, thiz);
if (!rep) return;
- std::string str = env->GetStringUTFChars(jKey, NULL);
+ std::string str = env->GetStringUTFChars(jKey, nullptr);
rep->setValue(str, static_cast<int>(jValue));
}
OCRepresentation *rep = JniOcRepresentation::getOCRepresentationPtr(env, thiz);
if (!rep) return;
- std::string str = env->GetStringUTFChars(jKey, NULL);
+ std::string str = env->GetStringUTFChars(jKey, nullptr);
rep->setValue(str, static_cast<double>(jValue));
}
OCRepresentation *rep = JniOcRepresentation::getOCRepresentationPtr(env, thiz);
if (!rep) return;
- std::string str = env->GetStringUTFChars(jKey, NULL);
+ std::string str = env->GetStringUTFChars(jKey, nullptr);
rep->setValue(str, static_cast<bool>(jValue));
}
OCRepresentation *rep = JniOcRepresentation::getOCRepresentationPtr(env, thiz);
if (!rep) return;
- std::string key = env->GetStringUTFChars(jKey, NULL);
- std::string value = env->GetStringUTFChars(jValue, NULL);
+ std::string key = env->GetStringUTFChars(jKey, nullptr);
+ std::string value = env->GetStringUTFChars(jValue, nullptr);
rep->setValue(key, value);
}
OCRepresentation *rep = JniOcRepresentation::getOCRepresentationPtr(env, thiz);
if (!rep) return;
- std::string key = env->GetStringUTFChars(jKey, NULL);
+ std::string key = env->GetStringUTFChars(jKey, nullptr);
OCRepresentation *value = JniOcRepresentation::getOCRepresentationPtr(env, jValue);
if (!value) return;
}
const jsize len = env->GetArrayLength(jValue);
- jint* ints = env->GetIntArrayElements(jValue, NULL);
+ jint* ints = env->GetIntArrayElements(jValue, nullptr);
std::vector<int> value;
for (jsize i = 0; i < len; ++i)
OCRepresentation *rep = JniOcRepresentation::getOCRepresentationPtr(env, thiz);
if (!rep) return;
- std::string key = env->GetStringUTFChars(jKey, NULL);
+ std::string key = env->GetStringUTFChars(jKey, nullptr);
rep->setValue(key, value);
}
for (jsize j = 0; j < lenOuter; ++j)
{
jintArray jInnerArray = static_cast<jintArray>(env->GetObjectArrayElement(jValue, j));
- jint* ints = env->GetIntArrayElements(jInnerArray, NULL);
+ jint* ints = env->GetIntArrayElements(jInnerArray, nullptr);
std::vector<int> innerVector;
const jsize lenInner = env->GetArrayLength(jInnerArray);
for (jsize i = 0; i < lenInner; ++i)
OCRepresentation *rep = JniOcRepresentation::getOCRepresentationPtr(env, thiz);
if (!rep) return;
- std::string key = env->GetStringUTFChars(jKey, NULL);
+ std::string key = env->GetStringUTFChars(jKey, nullptr);
rep->setValue(key, value);
}
for (jsize j = 0; j < lenMiddle; ++j)
{
jintArray jInnerArray = static_cast<jintArray>(env->GetObjectArrayElement(jMiddleArray, j));
- jint* ints = env->GetIntArrayElements(jInnerArray, NULL);
+ jint* ints = env->GetIntArrayElements(jInnerArray, nullptr);
std::vector<int> innerVector;
const jsize lenInner = env->GetArrayLength(jInnerArray);
for (jsize i = 0; i < lenInner; ++i)
OCRepresentation *rep = JniOcRepresentation::getOCRepresentationPtr(env, thiz);
if (!rep) return;
- std::string key = env->GetStringUTFChars(jKey, NULL);
+ std::string key = env->GetStringUTFChars(jKey, nullptr);
rep->setValue(key, value);
}
}
const jsize len = env->GetArrayLength(jValue);
- jdouble* doubles = env->GetDoubleArrayElements(jValue, NULL);
+ jdouble* doubles = env->GetDoubleArrayElements(jValue, nullptr);
std::vector<double> value;
for (jsize i = 0; i < len; ++i)
OCRepresentation *rep = JniOcRepresentation::getOCRepresentationPtr(env, thiz);
if (!rep) return;
- std::string key = env->GetStringUTFChars(jKey, NULL);
+ std::string key = env->GetStringUTFChars(jKey, nullptr);
rep->setValue(key, value);
}
for (jsize j = 0; j < lenOuter; ++j)
{
jdoubleArray jInnerArray = static_cast<jdoubleArray>(env->GetObjectArrayElement(jValue, j));
- jdouble* doubles = env->GetDoubleArrayElements(jInnerArray, NULL);
+ jdouble* doubles = env->GetDoubleArrayElements(jInnerArray, nullptr);
std::vector<double> innerVector;
const jsize lenInner = env->GetArrayLength(jInnerArray);
for (jsize i = 0; i < lenInner; ++i)
OCRepresentation *rep = JniOcRepresentation::getOCRepresentationPtr(env, thiz);
if (!rep) return;
- std::string key = env->GetStringUTFChars(jKey, NULL);
+ std::string key = env->GetStringUTFChars(jKey, nullptr);
rep->setValue(key, value);
}
for (jsize j = 0; j < lenMiddle; ++j)
{
jdoubleArray jInnerArray = static_cast<jdoubleArray>(env->GetObjectArrayElement(jMiddleArray, j));
- jdouble* doubles = env->GetDoubleArrayElements(jInnerArray, NULL);
+ jdouble* doubles = env->GetDoubleArrayElements(jInnerArray, nullptr);
std::vector<double> innerVector;
const jsize lenInner = env->GetArrayLength(jInnerArray);
for (jsize i = 0; i < lenInner; ++i)
OCRepresentation *rep = JniOcRepresentation::getOCRepresentationPtr(env, thiz);
if (!rep) return;
- std::string key = env->GetStringUTFChars(jKey, NULL);
+ std::string key = env->GetStringUTFChars(jKey, nullptr);
rep->setValue(key, value);
}
}
const jsize len = env->GetArrayLength(jValue);
- jboolean* booleans = env->GetBooleanArrayElements(jValue, NULL);
+ jboolean* booleans = env->GetBooleanArrayElements(jValue, nullptr);
std::vector<bool> value;
for (jsize i = 0; i < len; ++i)
OCRepresentation *rep = JniOcRepresentation::getOCRepresentationPtr(env, thiz);
if (!rep) return;
- std::string key = env->GetStringUTFChars(jKey, NULL);
+ std::string key = env->GetStringUTFChars(jKey, nullptr);
rep->setValue(key, value);
}
{
jbooleanArray jInnerArray = static_cast<jbooleanArray>(env->GetObjectArrayElement(jValue, j));
const jsize lenInner = env->GetArrayLength(jInnerArray);
- jboolean* booleans = env->GetBooleanArrayElements(jInnerArray, NULL);
+ jboolean* booleans = env->GetBooleanArrayElements(jInnerArray, nullptr);
std::vector<bool> innerVector;
for (jsize i = 0; i < lenInner; ++i)
OCRepresentation *rep = JniOcRepresentation::getOCRepresentationPtr(env, thiz);
if (!rep) return;
- std::string key = env->GetStringUTFChars(jKey, NULL);
+ std::string key = env->GetStringUTFChars(jKey, nullptr);
rep->setValue(key, value);
}
{
jbooleanArray jInnerArray = static_cast<jbooleanArray>(env->GetObjectArrayElement(jMiddleArray, j));
const jsize lenInner = env->GetArrayLength(jInnerArray);
- jboolean* booleans = env->GetBooleanArrayElements(jInnerArray, NULL);
+ jboolean* booleans = env->GetBooleanArrayElements(jInnerArray, nullptr);
std::vector<bool> innerVector;
for (jsize i = 0; i < lenInner; ++i)
OCRepresentation *rep = JniOcRepresentation::getOCRepresentationPtr(env, thiz);
if (!rep) return;
- std::string key = env->GetStringUTFChars(jKey, NULL);
+ std::string key = env->GetStringUTFChars(jKey, nullptr);
rep->setValue(key, value);
}
OCRepresentation *rep = JniOcRepresentation::getOCRepresentationPtr(env, thiz);
if (!rep) return;
- std::string key = env->GetStringUTFChars(jKey, NULL);
+ std::string key = env->GetStringUTFChars(jKey, nullptr);
rep->setValue(key, value);
}
OCRepresentation *rep = JniOcRepresentation::getOCRepresentationPtr(env, thiz);
if (!rep) return;
- std::string key = env->GetStringUTFChars(jKey, NULL);
+ std::string key = env->GetStringUTFChars(jKey, nullptr);
rep->setValue(key, value);
}
OCRepresentation *rep = JniOcRepresentation::getOCRepresentationPtr(env, thiz);
if (!rep) return;
- std::string key = env->GetStringUTFChars(jKey, NULL);
+ std::string key = env->GetStringUTFChars(jKey, nullptr);
rep->setValue(key, value);
}
OCRepresentation *rep = JniOcRepresentation::getOCRepresentationPtr(env, thiz);
if (!rep) return;
- std::string key = env->GetStringUTFChars(jKey, NULL);
+ std::string key = env->GetStringUTFChars(jKey, nullptr);
rep->setValue(key, value);
}
OCRepresentation *rep = JniOcRepresentation::getOCRepresentationPtr(env, thiz);
if (!rep) return;
- std::string key = env->GetStringUTFChars(jKey, NULL);
+ std::string key = env->GetStringUTFChars(jKey, nullptr);
rep->setValue(key, value);
}
OCRepresentation *rep = JniOcRepresentation::getOCRepresentationPtr(env, thiz);
if (!rep) return;
- std::string key = env->GetStringUTFChars(jKey, NULL);
+ std::string key = env->GetStringUTFChars(jKey, nullptr);
rep->setValue(key, value);
}
OCRepresentation *rep = JniOcRepresentation::getOCRepresentationPtr(env, thiz);
if (!rep) return;
- rep->setUri(env->GetStringUTFChars(jUri, NULL));
+ rep->setUri(env->GetStringUTFChars(jUri, nullptr));
}
JNIEXPORT jboolean JNICALL Java_org_iotivity_base_OcRepresentation_hasAttribute
OCRepresentation *rep = JniOcRepresentation::getOCRepresentationPtr(env, thiz);
if (!rep) return false;
- std::string str = env->GetStringUTFChars(jstr, NULL);
+ std::string str = env->GetStringUTFChars(jstr, nullptr);
return rep->hasAttribute(str);
}
OCRepresentation *rep = JniOcRepresentation::getOCRepresentationPtr(env, thiz);
if (!rep) return false;
- std::string attributeKey = env->GetStringUTFChars(jAttributeKey, NULL);
+ std::string attributeKey = env->GetStringUTFChars(jAttributeKey, nullptr);
return static_cast<jboolean>(rep->erase(attributeKey));
}
OCRepresentation *rep = JniOcRepresentation::getOCRepresentationPtr(env, thiz);
if (!rep) return;
- std::string attributeKey = env->GetStringUTFChars(jAttributeKey, NULL);
+ std::string attributeKey = env->GetStringUTFChars(jAttributeKey, nullptr);
rep->setNULL(attributeKey);
}
OCRepresentation *rep = JniOcRepresentation::getOCRepresentationPtr(env, thiz);
if (!rep) return false;
- std::string attributeKey = env->GetStringUTFChars(jAttributeKey, NULL);
+ std::string attributeKey = env->GetStringUTFChars(jAttributeKey, nullptr);
return static_cast<jboolean>(rep->isNULL(attributeKey));
}
jobject operator()(const std::vector<std::string>& val) const
{
size_t len = val.size();
- jobjectArray strArr = env->NewObjectArray(len, g_cls_String, NULL);
+ jobjectArray strArr = env->NewObjectArray(len, g_cls_String, nullptr);
if (!strArr) return nullptr;
for (size_t i = 0; i < len; ++i)
{
jobject operator()(const std::vector<OC::OCRepresentation>& val) const
{
jsize len = static_cast<jsize>(val.size());
- jobjectArray repArr = env->NewObjectArray(len, g_cls_OcRepresentation, NULL);
+ jobjectArray repArr = env->NewObjectArray(len, g_cls_OcRepresentation, nullptr);
if (!repArr) return nullptr;
for (jsize i = 0; i < len; ++i)
{
jobject operator()(const std::vector<std::vector<int>>& val) const
{
jsize lenOuter = static_cast<jsize>(val.size());
- jobjectArray jOuterArr = env->NewObjectArray(lenOuter, g_cls_int1DArray, NULL);
+ jobjectArray jOuterArr = env->NewObjectArray(lenOuter, g_cls_int1DArray, nullptr);
if (!jOuterArr)
{
return nullptr;
jobject operator()(const std::vector<std::vector<std::vector<int>>>& val) const
{
jsize lenOuter = static_cast<jsize>(val.size());
- jobjectArray jOuterArr = env->NewObjectArray(lenOuter, g_cls_int2DArray, NULL);
+ jobjectArray jOuterArr = env->NewObjectArray(lenOuter, g_cls_int2DArray, nullptr);
if (!jOuterArr) return nullptr;
for (jsize k = 0; k < lenOuter; ++k)
{
jsize lenMiddle = static_cast<jsize>(val[k].size());
- jobjectArray jMiddleArr = env->NewObjectArray(lenMiddle, g_cls_int1DArray, NULL);
+ jobjectArray jMiddleArr = env->NewObjectArray(lenMiddle, g_cls_int1DArray, nullptr);
if (!jMiddleArr) return nullptr;
for (jsize i = 0; i < lenMiddle; ++i)
{
jobject operator()(const std::vector<std::vector<double>>& val) const
{
jsize lenOuter = static_cast<jsize>(val.size());
- jobjectArray jOuterArr = env->NewObjectArray(lenOuter, g_cls_double1DArray, NULL);
+ jobjectArray jOuterArr = env->NewObjectArray(lenOuter, g_cls_double1DArray, nullptr);
if (!jOuterArr) return nullptr;
for (jsize i = 0; i < lenOuter; ++i)
{
jobject operator()(const std::vector<std::vector<std::vector<double>>>& val) const
{
jsize lenOuter = static_cast<jsize>(val.size());
- jobjectArray jOuterArr = env->NewObjectArray(lenOuter, g_cls_double2DArray, NULL);
+ jobjectArray jOuterArr = env->NewObjectArray(lenOuter, g_cls_double2DArray, nullptr);
if (!jOuterArr) return nullptr;
for (jsize k = 0; k < lenOuter; ++k)
{
jsize lenMiddle = static_cast<jsize>(val[k].size());
- jobjectArray jMiddleArr = env->NewObjectArray(lenMiddle, g_cls_double1DArray, NULL);
+ jobjectArray jMiddleArr = env->NewObjectArray(lenMiddle, g_cls_double1DArray, nullptr);
if (!jMiddleArr) return nullptr;
for (jsize i = 0; i < lenMiddle; ++i)
{
jobject operator()(const std::vector<std::vector<std::vector<bool>>>& val) const
{
jsize lenOuter = static_cast<jsize>(val.size());
- jobjectArray jOuterArr = env->NewObjectArray(lenOuter, g_cls_boolean2DArray, NULL);
+ jobjectArray jOuterArr = env->NewObjectArray(lenOuter, g_cls_boolean2DArray, nullptr);
if (!jOuterArr) return nullptr;
for (jsize k = 0; k < lenOuter; ++k)
{
jsize lenMiddle = static_cast<jsize>(val[k].size());
- jobjectArray jMiddleArr = env->NewObjectArray(lenMiddle, g_cls_boolean1DArray, NULL);
+ jobjectArray jMiddleArr = env->NewObjectArray(lenMiddle, g_cls_boolean1DArray, nullptr);
if (!jMiddleArr) return nullptr;
for (jsize i = 0; i < lenMiddle; ++i)
{
jobject operator()(const std::vector<std::vector<std::string>>& val) const
{
jsize lenOuter = static_cast<jsize>(val.size());
- jobjectArray jOuterArr = env->NewObjectArray(lenOuter, g_cls_String1DArray, NULL);
+ jobjectArray jOuterArr = env->NewObjectArray(lenOuter, g_cls_String1DArray, nullptr);
if (!jOuterArr) return nullptr;
for (jsize i = 0; i < lenOuter; ++i)
{
jsize lenInner = static_cast<jsize>(val[i].size());
- jobjectArray strArr = env->NewObjectArray(lenInner, g_cls_String, NULL);
+ jobjectArray strArr = env->NewObjectArray(lenInner, g_cls_String, nullptr);
if (!strArr) return nullptr;
for (jsize j = 0; j < lenInner; ++j)
{
jobject operator()(const std::vector<std::vector<std::vector<std::string>>>& val) const
{
jsize lenOuter = static_cast<jsize>(val.size());
- jobjectArray jOuterArr = env->NewObjectArray(lenOuter, g_cls_String2DArray, NULL);
+ jobjectArray jOuterArr = env->NewObjectArray(lenOuter, g_cls_String2DArray, nullptr);
if (!jOuterArr) return nullptr;
for (jsize k = 0; k < lenOuter; ++k)
{
jsize lenMiddle = static_cast<jsize>(val[k].size());
- jobjectArray jMiddleArr = env->NewObjectArray(lenMiddle, g_cls_String1DArray, NULL);
+ jobjectArray jMiddleArr = env->NewObjectArray(lenMiddle, g_cls_String1DArray, nullptr);
if (!jMiddleArr) return nullptr;
for (jsize i = 0; i < lenMiddle; ++i)
{
jsize lenInner = static_cast<jsize>(val[k][i].size());
- jobjectArray strArr = env->NewObjectArray(lenInner, g_cls_String, NULL);
+ jobjectArray strArr = env->NewObjectArray(lenInner, g_cls_String, nullptr);
if (!strArr) return nullptr;
for (jsize j = 0; j < lenInner; ++j)
{
jobject operator()(const std::vector<std::vector<OC::OCRepresentation>>& val) const
{
jsize lenOuter = static_cast<jsize>(val.size());
- jobjectArray jOuterArr = env->NewObjectArray(lenOuter, g_cls_OcRepresentation1DArray, NULL);
+ jobjectArray jOuterArr = env->NewObjectArray(lenOuter, g_cls_OcRepresentation1DArray, nullptr);
if (!jOuterArr) return nullptr;
for (jsize i = 0; i < lenOuter; ++i)
{
jsize lenInner = static_cast<jsize>(val[i].size());
- jobjectArray repArr = env->NewObjectArray(lenInner, g_cls_OcRepresentation, NULL);
+ jobjectArray repArr = env->NewObjectArray(lenInner, g_cls_OcRepresentation, nullptr);
if (!repArr) return nullptr;
for (jsize j = 0; j < lenInner; ++j)
{
jobject operator()(const std::vector<std::vector<std::vector<OC::OCRepresentation>>>& val) const
{
jsize lenOuter = static_cast<jsize>(val.size());
- jobjectArray jOuterArr = env->NewObjectArray(lenOuter, g_cls_OcRepresentation2DArray, NULL);
+ jobjectArray jOuterArr = env->NewObjectArray(lenOuter, g_cls_OcRepresentation2DArray, nullptr);
if (!jOuterArr) return nullptr;
for (jsize k = 0; k < lenOuter; ++k)
{
jsize lenMiddle = static_cast<jsize>(val[k].size());
- jobjectArray jMiddleArr = env->NewObjectArray(lenMiddle, g_cls_OcRepresentation1DArray, NULL);
+ jobjectArray jMiddleArr = env->NewObjectArray(lenMiddle, g_cls_OcRepresentation1DArray, nullptr);
if (!jMiddleArr) return nullptr;
for (jsize i = 0; i < lenMiddle; ++i)
{
jsize lenInner = static_cast<jsize>(val[k][i].size());
- jobjectArray repArr = env->NewObjectArray(lenInner, g_cls_OcRepresentation, NULL);
+ jobjectArray repArr = env->NewObjectArray(lenInner, g_cls_OcRepresentation, nullptr);
if (!repArr) return nullptr;
for (jsize j = 0; j < lenInner; ++j)
{
{
LOGD("~JniOcResource()");
- m_sharedResource->cancelObserve();
- m_sharedResource = NULL;
+ m_sharedResource = nullptr;
jint envRet;
JNIEnv *env = GetJNIEnv(envRet);
- if (NULL == env) return;
+ if (nullptr == env) return;
m_onGetManager.removeAllListeners(env);
m_onPutManager.removeAllListeners(env);
std::string resourceType;
if (jResourceType)
{
- resourceType = env->GetStringUTFChars(jResourceType, NULL);
+ resourceType = env->GetStringUTFChars(jResourceType, nullptr);
}
std::string resourceInterface;
if (jResourceInterface)
{
- resourceInterface = env->GetStringUTFChars(jResourceInterface, NULL);
+ resourceInterface = env->GetStringUTFChars(jResourceInterface, nullptr);
}
if (!jQueryParamsMap)
{
std::string resourceType;
if (jResourceType)
{
- resourceType = env->GetStringUTFChars(jResourceType, NULL);
+ resourceType = env->GetStringUTFChars(jResourceType, nullptr);
}
std::string resourceInterface;
if (jResourceInterface)
{
- resourceInterface = env->GetStringUTFChars(jResourceInterface, NULL);
+ resourceInterface = env->GetStringUTFChars(jResourceInterface, nullptr);
}
JniOcResource *resource = JniOcResource::getJniOcResourcePtr(env, thiz);
if (!resource) return;
std::string resourceType;
if (jResourceType)
{
- resourceType = env->GetStringUTFChars(jResourceType, NULL);
+ resourceType = env->GetStringUTFChars(jResourceType, nullptr);
}
std::string resourceInterface;
if (jResourceInterface)
{
- resourceInterface = env->GetStringUTFChars(jResourceInterface, NULL);
+ resourceInterface = env->GetStringUTFChars(jResourceInterface, nullptr);
}
if (!jRepresentation)
{
std::string resourceType;
if (jResourceType)
{
- resourceType = env->GetStringUTFChars(jResourceType, NULL);
+ resourceType = env->GetStringUTFChars(jResourceType, nullptr);
}
std::string resourceInterface;
if (jResourceInterface)
{
- resourceInterface = env->GetStringUTFChars(jResourceInterface, NULL);
+ resourceInterface = env->GetStringUTFChars(jResourceInterface, nullptr);
}
JniOcResource *resource = JniOcResource::getJniOcResourcePtr(env, thiz);
std::string resourceType;
if (jResourceType)
{
- resourceType = env->GetStringUTFChars(jResourceType, NULL);
+ resourceType = env->GetStringUTFChars(jResourceType, nullptr);
}
std::string resourceInterface;
if (jResourceInterface)
{
- resourceInterface = env->GetStringUTFChars(jResourceInterface, NULL);
+ resourceInterface = env->GetStringUTFChars(jResourceInterface, nullptr);
}
JniOcResource *resource = JniOcResource::getJniOcResourcePtr(env, thiz);
std::string resourceType;
if (jResourceType)
{
- resourceType = env->GetStringUTFChars(jResourceType, NULL);
+ resourceType = env->GetStringUTFChars(jResourceType, nullptr);
}
std::string resourceInterface;
if (jResourceInterface)
{
- resourceInterface = env->GetStringUTFChars(jResourceInterface, NULL);
+ resourceInterface = env->GetStringUTFChars(jResourceInterface, nullptr);
}
JniOcResource *resource = JniOcResource::getJniOcResourcePtr(env, thiz);
#include "OCRepresentation.h"
#include "JniUtils.h"
-JavaVM* g_jvm = NULL;
-
-jclass g_cls_Integer = NULL;
-jclass g_cls_int1DArray = NULL;
-jclass g_cls_int2DArray = NULL;
-jclass g_cls_Double = NULL;
-jclass g_cls_double1DArray = NULL;
-jclass g_cls_double2DArray = NULL;
-jclass g_cls_Boolean = NULL;
-jclass g_cls_boolean1DArray = NULL;
-jclass g_cls_boolean2DArray = NULL;
-jclass g_cls_String = NULL;
-jclass g_cls_String1DArray = NULL;
-jclass g_cls_String2DArray = NULL;
-jclass g_cls_LinkedList = NULL;
-jclass g_cls_Map = NULL;
-jclass g_cls_MapEntry = NULL;
-jclass g_cls_Set = NULL;
-jclass g_cls_Iterator = NULL;
-jclass g_cls_HashMap = NULL;
-jclass g_cls_OcException = NULL;
-jclass g_cls_OcResource = NULL;
-jclass g_cls_OcRepresentation = NULL;
-jclass g_cls_OcRepresentation1DArray = NULL;
-jclass g_cls_OcRepresentation2DArray = NULL;
-jclass g_cls_OcResourceRequest = NULL;
-jclass g_cls_OcResourceResponse = NULL;
-jclass g_cls_OcResourceHandle = NULL;
-jclass g_cls_OcPresenceHandle = NULL;
-jclass g_cls_OcRequestHandle = NULL;
-jclass g_cls_OcPresenceStatus = NULL;
-jclass g_cls_OcHeaderOption = NULL;
-jclass g_cls_ObservationInfo = NULL;
-jclass g_cls_OcResourceIdentifier = NULL;
-
-jmethodID g_mid_Integer_ctor = NULL;
-jmethodID g_mid_Double_ctor = NULL;
-jmethodID g_mid_Boolean_ctor = NULL;
-jmethodID g_mid_LinkedList_ctor = NULL;
-jmethodID g_mid_LinkedList_add_object = NULL;
-jmethodID g_mid_Map_entrySet = NULL;
-jmethodID g_mid_MapEntry_getKey = NULL;
-jmethodID g_mid_MapEntry_getValue = NULL;
-jmethodID g_mid_Set_iterator = NULL;
-jmethodID g_mid_Iterator_hasNext = NULL;
-jmethodID g_mid_Iterator_next = NULL;
-jmethodID g_mid_HashMap_ctor = NULL;
-jmethodID g_mid_HashMap_put = NULL;
-jmethodID g_mid_OcException_ctor = NULL;
-jmethodID g_mid_OcException_setNativeExceptionLocation = NULL;
-jmethodID g_mid_OcResource_ctor = NULL;
-jmethodID g_mid_OcRepresentation_N_ctor = NULL;
-jmethodID g_mid_OcRepresentation_N_ctor_bool = NULL;
-jmethodID g_mid_OcResourceRequest_N_ctor = NULL;
-jmethodID g_mid_OcResourceResponse_N_ctor = NULL;
-jmethodID g_mid_OcResourceHandle_N_ctor = NULL;
-jmethodID g_mid_OcPresenceHandle_N_ctor = NULL;
-jmethodID g_mid_OcRequestHandle_N_ctor = NULL;
-jmethodID g_mid_OcHeaderOption_ctor = NULL;
-jmethodID g_mid_OcHeaderOption_get_id = NULL;
-jmethodID g_mid_OcHeaderOption_get_data = NULL;
-jmethodID g_mid_ObservationInfo_N_ctor = NULL;
-jmethodID g_mid_OcPresenceStatus_get = NULL;
-jmethodID g_mid_OcResourceIdentifier_N_ctor = NULL;
+JavaVM* g_jvm = nullptr;
+
+jclass g_cls_Integer = nullptr;
+jclass g_cls_int1DArray = nullptr;
+jclass g_cls_int2DArray = nullptr;
+jclass g_cls_Double = nullptr;
+jclass g_cls_double1DArray = nullptr;
+jclass g_cls_double2DArray = nullptr;
+jclass g_cls_Boolean = nullptr;
+jclass g_cls_boolean1DArray = nullptr;
+jclass g_cls_boolean2DArray = nullptr;
+jclass g_cls_String = nullptr;
+jclass g_cls_String1DArray = nullptr;
+jclass g_cls_String2DArray = nullptr;
+jclass g_cls_LinkedList = nullptr;
+jclass g_cls_Map = nullptr;
+jclass g_cls_MapEntry = nullptr;
+jclass g_cls_Set = nullptr;
+jclass g_cls_Iterator = nullptr;
+jclass g_cls_HashMap = nullptr;
+jclass g_cls_OcException = nullptr;
+jclass g_cls_OcResource = nullptr;
+jclass g_cls_OcRepresentation = nullptr;
+jclass g_cls_OcRepresentation1DArray = nullptr;
+jclass g_cls_OcRepresentation2DArray = nullptr;
+jclass g_cls_OcResourceRequest = nullptr;
+jclass g_cls_OcResourceResponse = nullptr;
+jclass g_cls_OcResourceHandle = nullptr;
+jclass g_cls_OcPresenceHandle = nullptr;
+jclass g_cls_OcRequestHandle = nullptr;
+jclass g_cls_OcPresenceStatus = nullptr;
+jclass g_cls_OcHeaderOption = nullptr;
+jclass g_cls_ObservationInfo = nullptr;
+jclass g_cls_OcResourceIdentifier = nullptr;
+
+jmethodID g_mid_Integer_ctor = nullptr;
+jmethodID g_mid_Double_ctor = nullptr;
+jmethodID g_mid_Boolean_ctor = nullptr;
+jmethodID g_mid_LinkedList_ctor = nullptr;
+jmethodID g_mid_LinkedList_add_object = nullptr;
+jmethodID g_mid_Map_entrySet = nullptr;
+jmethodID g_mid_MapEntry_getKey = nullptr;
+jmethodID g_mid_MapEntry_getValue = nullptr;
+jmethodID g_mid_Set_iterator = nullptr;
+jmethodID g_mid_Iterator_hasNext = nullptr;
+jmethodID g_mid_Iterator_next = nullptr;
+jmethodID g_mid_HashMap_ctor = nullptr;
+jmethodID g_mid_HashMap_put = nullptr;
+jmethodID g_mid_OcException_ctor = nullptr;
+jmethodID g_mid_OcException_setNativeExceptionLocation = nullptr;
+jmethodID g_mid_OcResource_ctor = nullptr;
+jmethodID g_mid_OcRepresentation_N_ctor = nullptr;
+jmethodID g_mid_OcRepresentation_N_ctor_bool = nullptr;
+jmethodID g_mid_OcResourceRequest_N_ctor = nullptr;
+jmethodID g_mid_OcResourceResponse_N_ctor = nullptr;
+jmethodID g_mid_OcResourceHandle_N_ctor = nullptr;
+jmethodID g_mid_OcPresenceHandle_N_ctor = nullptr;
+jmethodID g_mid_OcRequestHandle_N_ctor = nullptr;
+jmethodID g_mid_OcHeaderOption_ctor = nullptr;
+jmethodID g_mid_OcHeaderOption_get_id = nullptr;
+jmethodID g_mid_OcHeaderOption_get_data = nullptr;
+jmethodID g_mid_ObservationInfo_N_ctor = nullptr;
+jmethodID g_mid_OcPresenceStatus_get = nullptr;
+jmethodID g_mid_OcResourceIdentifier_N_ctor = nullptr;
jobject getOcException(JNIEnv* env, const char* file, const char* functionName,
const int line, const int code, const char* message)
LOGI("JNI_OnUnload");
JNIEnv* env;
- if (g_jvm->GetEnv((void **)&env, JNI_CURRENT_VERSION) != JNI_OK)
+ if (vm->GetEnv((void **)&env, JNI_CURRENT_VERSION) != JNI_OK)
{
LOGE("Failed to get the environment using GetEnv()");
return;
static JNIEnv* GetJNIEnv(jint& ret)
{
- JNIEnv *env = NULL;
+ JNIEnv *env = nullptr;
ret = g_jvm->GetEnv((void **)&env, JNI_CURRENT_VERSION);
switch (ret) {
case JNI_OK:
return env;
case JNI_EDETACHED:
- if (g_jvm->AttachCurrentThread(&env, NULL) < 0)
+ if (g_jvm->AttachCurrentThread(&env, nullptr) < 0)
{
LOGE("Failed to get the environment");
return nullptr;
{
jint ret;
JNIEnv *env = GetJNIEnv(ret);
- if (NULL == env) return;
+ if (nullptr == env) return;
env->DeleteWeakGlobalRef(m_jwListener);
m_jwListener = nullptr;
{
jint envRet;
JNIEnv *env = GetJNIEnv(envRet);
- if (NULL == env) return;
+ if (nullptr == env) return;
jobject jListener = env->NewLocalRef(m_jwListener);
if (!jListener)
{
jint ret;
JNIEnv *env = GetJNIEnv(ret);
- if (NULL == env) return;
+ if (nullptr == env) return;
+
env->DeleteWeakGlobalRef(m_jwListener);
+ m_jwListener = nullptr;
+
if (JNI_EDETACHED == ret) g_jvm->DetachCurrentThread();
}
}
{
jint ret;
JNIEnv *env = GetJNIEnv(ret);
- if (NULL == env) return;
+ if (nullptr == env) return;
jobject jListener = env->NewLocalRef(m_jwListener);
if (!jListener)
JniOnGetListener::~JniOnGetListener()
{
+ LOGD("~JniOnGetListener");
if (m_jwListener)
{
jint ret;
JNIEnv *env = GetJNIEnv(ret);
- if (NULL == env) return;
+ if (nullptr == env) return;
env->DeleteWeakGlobalRef(m_jwListener);
m_jwListener = nullptr;
{
jint envRet;
JNIEnv *env = GetJNIEnv(envRet);
- if (NULL == env) return;
+ if (nullptr == env) return;
jobject jListener = env->NewLocalRef(m_jwListener);
if (!jListener)
{
jint ret;
JNIEnv *env = GetJNIEnv(ret);
- if (NULL == env) return;
+ if (nullptr == env) return;
env->DeleteWeakGlobalRef(m_jwListener);
m_jwListener = nullptr;
{
jint envRet;
JNIEnv *env = GetJNIEnv(envRet);
- if (NULL == env) return;
+ if (nullptr == env) return;
jobject jListener = env->NewLocalRef(m_jwListener);
if (!jListener)
{
jint ret;
JNIEnv *env = GetJNIEnv(ret);
- if (NULL == env) return;
+ if (nullptr == env) return;
+
env->DeleteWeakGlobalRef(m_jwListener);
+ m_jwListener = nullptr;
+
if (JNI_EDETACHED == ret) g_jvm->DetachCurrentThread();
}
}
{
jint ret;
JNIEnv *env = GetJNIEnv(ret);
- if (NULL == env) return;
+ if (nullptr == env) return;
jobject jListener = env->NewLocalRef(m_jwListener);
if (!jListener)
{
jint ret;
JNIEnv *env = GetJNIEnv(ret);
- if (NULL == env) return;
+ if (nullptr == env) return;
env->DeleteWeakGlobalRef(m_jwListener);
m_jwListener = nullptr;
{
jint envRet;
JNIEnv *env = GetJNIEnv(envRet);
- if (NULL == env) return;
+ if (nullptr == env) return;
jobject jListener = env->NewLocalRef(m_jwListener);
if (!jListener)
{
jint ret;
JNIEnv *env = GetJNIEnv(ret);
- if (NULL == env) return;
+ if (nullptr == env) return;
+
env->DeleteWeakGlobalRef(m_jwListener);
m_jwListener = nullptr;
+
if (JNI_EDETACHED == ret) g_jvm->DetachCurrentThread();
}
}
jint ret;
JNIEnv *env = GetJNIEnv(ret);
- if (NULL == env) return;
+ if (nullptr == env) return;
if (OC_STACK_OK != result && OC_STACK_PRESENCE_STOPPED != result &&
OC_STACK_PRESENCE_TIMEOUT != result && OC_STACK_PRESENCE_DO_NOT_HANDLE != result)
{
jint ret;
JNIEnv *env = GetJNIEnv(ret);
- if (NULL == env) return;
+ if (nullptr == env) return;
env->DeleteWeakGlobalRef(m_jwListener);
m_jwListener = nullptr;
{
jint envRet;
JNIEnv *env = GetJNIEnv(envRet);
- if (NULL == env) return;
+ if (nullptr == env) return;
jobject jListener = env->NewLocalRef(m_jwListener);
if (!jListener)
{
jint ret;
JNIEnv *env = GetJNIEnv(ret);
- if (NULL == env) return;
+ if (nullptr == env) return;
env->DeleteWeakGlobalRef(m_jwListener);
+ m_jwListener = nullptr;
if (JNI_EDETACHED == ret) g_jvm->DetachCurrentThread();
}
}
{
jint ret;
JNIEnv *env = GetJNIEnv(ret);
- if (NULL == env) return;
+ if (nullptr == env) return;
jobject jListener = env->NewLocalRef(m_jwListener);
if (!jListener)
{
jstring jStr = (jstring)env->GetObjectArrayElement(jStrArr, i);
if (!jStr) return;
- vector.push_back(env->GetStringUTFChars(jStr, NULL));
+ vector.push_back(env->GetStringUTFChars(jStr, nullptr));
if (env->ExceptionCheck()) return;
env->DeleteLocalRef(jStr);
}
jstring jData = (jstring)env->CallObjectMethod(header, g_mid_OcHeaderOption_get_data);
OC::HeaderOption::OCHeaderOption hopt(
static_cast<int>(jId),
- env->GetStringUTFChars(jData, NULL));
+ env->GetStringUTFChars(jData, nullptr));
headerOptions.push_back(hopt);
jstring jValue = (jstring)env->CallObjectMethod(jEntry, g_mid_MapEntry_getValue);
if (!jValue) return;
- map.insert(std::make_pair(env->GetStringUTFChars(jKey, NULL),
- env->GetStringUTFChars(jValue, NULL)));
+ map.insert(std::make_pair(env->GetStringUTFChars(jKey, nullptr),
+ env->GetStringUTFChars(jValue, nullptr)));
if (env->ExceptionCheck()) return;
env->DeleteLocalRef(jEntry);
const std::vector<OC::OCRepresentation>& representationVector)
{
jsize len = static_cast<jsize>(representationVector.size());
- jobjectArray repArr = env->NewObjectArray(len, g_cls_OcRepresentation, NULL);
+ jobjectArray repArr = env->NewObjectArray(len, g_cls_OcRepresentation, nullptr);
if (!repArr) return nullptr;
for (jsize i = 0; i < len; ++i)
{