From 467c73574e41dc7177b0c990cd5e1e80a37cf3d4 Mon Sep 17 00:00:00 2001 From: DarthArgus Date: Fri, 19 Feb 2016 18:24:46 -0600 Subject: [PATCH] undo the "brackets mothafucka" commit as this should probably still be proper --- .../serverScript/src/shared/JNIWrappers.cpp | 24 +++++-------------- 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/engine/server/library/serverScript/src/shared/JNIWrappers.cpp b/engine/server/library/serverScript/src/shared/JNIWrappers.cpp index e5ca59c0..cb943db2 100755 --- a/engine/server/library/serverScript/src/shared/JNIWrappers.cpp +++ b/engine/server/library/serverScript/src/shared/JNIWrappers.cpp @@ -903,10 +903,8 @@ LocalRef::LocalRef(jobject src) : LocalRef::~LocalRef() { if (m_ref > 0 && JavaLibrary::getEnv() != nullptr) - { JavaLibrary::getEnv()->DeleteLocalRef(m_ref); - m_ref = 0; - } + m_ref = 0; } @@ -920,10 +918,8 @@ LocalArrayRef::LocalArrayRef(jarray src) : LocalArrayRef::~LocalArrayRef() { if (m_ref > 0 && JavaLibrary::getEnv() != nullptr) - { JavaLibrary::getEnv()->DeleteLocalRef(m_ref); - m_ref = 0; - } + m_ref = 0; } @@ -937,10 +933,8 @@ LocalObjectArrayRef::LocalObjectArrayRef(jobjectArray src) : LocalObjectArrayRef::~LocalObjectArrayRef() { if (m_ref > 0 && JavaLibrary::getEnv() != nullptr) - { JavaLibrary::getEnv()->DeleteLocalRef(m_ref); - m_ref = 0; - } + m_ref = 0; } @@ -1015,10 +1009,8 @@ GlobalRef::GlobalRef(const LocalRefParam & src) : GlobalRef::~GlobalRef() { if (m_ref > 0 && JavaLibrary::getEnv() != nullptr) - { JavaLibrary::getEnv()->DeleteGlobalRef(m_ref); - m_ref = 0; - } + m_ref = 0; } @@ -1034,10 +1026,8 @@ GlobalArrayRef::GlobalArrayRef(const LocalObjectArrayRefParam & src) : GlobalArrayRef::~GlobalArrayRef() { if (m_ref > 0 && JavaLibrary::getEnv() != nullptr) - { JavaLibrary::getEnv()->DeleteGlobalRef(m_ref); - m_ref = 0; - } + m_ref = 0; } //======================================================================== @@ -1104,10 +1094,8 @@ JavaString::JavaString(const Unicode::String & src) : JavaString::~JavaString() { if (m_ref > 0 && JavaLibrary::getEnv() != nullptr) - { JavaLibrary::getEnv()->DeleteLocalRef(m_ref); - m_ref = 0; - } + m_ref = 0; }