Merge pull request #1 from BlueMountainsIO/master

Memory leak fixes

Author: dig

README.md

@@ -16,6 +16,31 @@ You can use our [language framework](https://github.com/OnfireNetwork/OnsetJava)
 2. Ensure Java 8 JDK/JRE 64bit is installed.
 3. Enable "OnsetJavaPlugin" as a plugin inside server_config.json.
 
+#### Compiling from source
+##### Ubuntu 18.04
+```
+# Compiling the plugin requires GCC8 because of <filesystem> usage.
+
+apt install openjdk-8-jdk openjdk-8-jre maven gcc-8 g++-8
+
+export CC=/usr/bin/gcc-8
+export CXX=/usr/bin/g++-8
+
+git clone --recurse-submodules https://github.com/OnfireNetwork/OnsetJavaPlugin
+cd OnsetJavaPlugin
+cmake .
+make
+
+# Copy src/OnsetJavaPlugin.so to your OnsetServer/plugins folder.
+```
+##### Compiling OnsetJavaPluginSupport
+```
+cd OnsetJavaPluginSupport
+mvn package
+
+# Copy OnsetJavaPluginSupport/target/OnsetJavaPluginSupport-1.0.jar to your OnsetServer/java folder.
+```
+
 ### Data Types we support
 #### Method Parameters
 * Lua String -> String (java.lang.String)

src/Plugin.cpp

@@ -81,16 +81,16 @@ void CallEvent(JNIEnv* jenv, jclass jcl, jstring event, jobjectArray argsList) {
 	(void)jcl;
 
 	const char* eventStr = jenv->GetStringUTFChars(event, nullptr);
-	auto args = new Lua::LuaArgs_t();
+	Lua::LuaArgs_t args;
 
 	int argsCount = jenv->GetArrayLength(argsList);
 
 	for (jsize i = 0; i < argsCount; i++) {
 		jobject arrayElement = jenv->GetObjectArrayElement(argsList, i);
-		args->push_back(env->ToLuaValue(arrayElement));
+		args.push_back(env->ToLuaValue(arrayElement));
 	}
 
-	Onset::Plugin::Get()->CallEvent(eventStr, args);
+	Onset::Plugin::Get()->CallEvent(eventStr, &args);
 
 	jenv->ReleaseStringUTFChars(event, eventStr);
 }
@@ -106,12 +106,12 @@ jobjectArray CallGlobal(JNIEnv* jenv, jclass jcl, jstring packageName, jstring f
 	const char* packageNameStr = jenv->GetStringUTFChars(packageName, nullptr);
 	const char* functionNameStr = jenv->GetStringUTFChars(functionName, nullptr);
 	int argsLength = jenv->GetArrayLength(args);
-	auto luaArgs = new Lua::LuaArgs_t();
+	Lua::LuaArgs_t luaArgs;
 	for (jsize i = 0; i < argsLength; i++) {
-		luaArgs->push_back(env->ToLuaValue(jenv->GetObjectArrayElement(args, i)));
+		luaArgs.push_back(env->ToLuaValue(jenv->GetObjectArrayElement(args, i)));
 	}
 
-	auto luaReturns = CallLuaFunction(Plugin::Get()->GetPackageState(packageNameStr), functionNameStr, luaArgs);
+	auto luaReturns = CallLuaFunction(Plugin::Get()->GetPackageState(packageNameStr), functionNameStr, &luaArgs);
 	size_t returnsLength = luaReturns.size();
 	jclass objectCls = jenv->FindClass("Ljava/lang/Object;");
 	jobjectArray returns = jenv->NewObjectArray((jsize)returnsLength, objectCls, NULL);