From 946cddb179e56e2717e63bbaad85d5fb7e85c6be Mon Sep 17 00:00:00 2001 From: DarthArgus Date: Mon, 8 Feb 2016 17:00:25 -0600 Subject: [PATCH] Revert "actually this should be in release and debug" This reverts commit fc9c045e53e51e6b51eb9bdabe8770bde0575a65. --- .../library/serverScript/src/shared/JNIWrappers.cpp | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/engine/server/library/serverScript/src/shared/JNIWrappers.cpp b/engine/server/library/serverScript/src/shared/JNIWrappers.cpp index ffa9375b..55c71701 100755 --- a/engine/server/library/serverScript/src/shared/JNIWrappers.cpp +++ b/engine/server/library/serverScript/src/shared/JNIWrappers.cpp @@ -459,7 +459,9 @@ JavaStringPtr callStringMethod(const LocalRefParam & object, jmethodID methodID, { if (!JavaLibrary::getEnv()->IsInstanceOf(result, JavaLibrary::ms_clsString)) { +#ifdef _DEBUG WARNING_STRICT_FATAL(true, ("JavaLibrary::callStringMethod called with non-string result")); +#endif JavaLibrary::getEnv()->DeleteLocalRef(result); return JavaString::cms_nullPtr; } @@ -902,7 +904,6 @@ LocalRef::LocalRef(jobject src) : LocalRef::~LocalRef() { - WARNING(true, ("m_ref is %i in LocalRef destructor", m_ref)); if (m_ref != 0 && JavaLibrary::getEnv() != NULL) JavaLibrary::getEnv()->DeleteLocalRef(m_ref); m_ref = 0; @@ -918,7 +919,6 @@ LocalArrayRef::LocalArrayRef(jarray src) : LocalArrayRef::~LocalArrayRef() { - WARNING(true, ("m_ref is %i in LocalArrayRef destructor", m_ref)); if (m_ref != 0 && JavaLibrary::getEnv() != NULL) JavaLibrary::getEnv()->DeleteLocalRef(m_ref); m_ref = 0; @@ -934,7 +934,6 @@ LocalObjectArrayRef::LocalObjectArrayRef(jobjectArray src) : LocalObjectArrayRef::~LocalObjectArrayRef() { - WARNING(true, ("m_ref is %i in LocalObjectArrayRef destructor", m_ref)); if (m_ref != 0 && JavaLibrary::getEnv() != NULL) JavaLibrary::getEnv()->DeleteLocalRef(m_ref); m_ref = 0; @@ -1011,7 +1010,6 @@ GlobalRef::GlobalRef(const LocalRefParam & src) : GlobalRef::~GlobalRef() { - WARNING(true, ("m_ref is %i in GlobalRef destructor", m_ref)); if (m_ref != 0 && JavaLibrary::getEnv() != NULL) JavaLibrary::getEnv()->DeleteGlobalRef(m_ref); m_ref = 0; @@ -1029,8 +1027,6 @@ GlobalArrayRef::GlobalArrayRef(const LocalObjectArrayRefParam & src) : GlobalArrayRef::~GlobalArrayRef() { - - WARNING(true, ("m_ref is %i in GlobalArrayRef destructor", m_ref)); if (m_ref != 0 && JavaLibrary::getEnv() != NULL) JavaLibrary::getEnv()->DeleteGlobalRef(m_ref); m_ref = 0; @@ -1099,7 +1095,6 @@ JavaString::JavaString(const Unicode::String & src) : JavaString::~JavaString() { - WARNING(true, ("m_ref is %i in JavaString destructor", m_ref)); if (m_ref != 0 && JavaLibrary::getEnv() != NULL) JavaLibrary::getEnv()->DeleteLocalRef(m_ref); m_ref = 0;