From f1d654ddc2005451f17e2916ffe4d21e19bceae7 Mon Sep 17 00:00:00 2001 From: DarthArgus Date: Fri, 22 Jan 2016 12:32:59 -0600 Subject: [PATCH] ifdef correction - not what broke ord mantell but not correct before either --- .../library/serverScript/src/shared/JNIWrappers.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/engine/server/library/serverScript/src/shared/JNIWrappers.cpp b/engine/server/library/serverScript/src/shared/JNIWrappers.cpp index da46a0f7..af92a8de 100755 --- a/engine/server/library/serverScript/src/shared/JNIWrappers.cpp +++ b/engine/server/library/serverScript/src/shared/JNIWrappers.cpp @@ -457,14 +457,14 @@ JavaStringPtr callStringMethod(const LocalRefParam & object, jmethodID methodID, if (result != 0) { -#ifdef _DEBUG if (!JavaLibrary::getEnv()->IsInstanceOf(result, JavaLibrary::ms_clsString)) { +#ifdef _DEBUG WARNING_STRICT_FATAL(true, ("JavaLibrary::callStringMethod called with non-string result")); JavaLibrary::getEnv()->DeleteLocalRef(result); +#endif return JavaString::cms_nullPtr; } -#endif return JavaStringPtr(new JavaString(static_cast(result))); } } @@ -577,14 +577,14 @@ void setObjectArrayElement(const LocalObjectArrayRefParam & array, jsize index, { if (array.getValue() != 0 && index >= 0) { -#ifdef _DEBUG if (index >= JavaLibrary::getEnv()->GetArrayLength(array.getValue())) { +#ifdef _DEBUG WARNING(true, ("JavaLibrary::setObjectArrayElement array index %d " "out of bounds", static_cast(index))); +#endif return; } -#endif JavaLibrary::getEnv()->SetObjectArrayElement(array.getValue(), index, value.getValue()); } }