check always for cached module

Author: Mihail Slavchev

src/jni/Module.cpp

@@ -143,20 +143,9 @@ void Module::RequireCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
 		// cache the required modules by full path, not name only, since there might be some collisions with relative paths and names
 		string modulePath = ArgConverter::jstringToString((jstring) jsModulePath);
 
-		auto it = s_loadedModules.find(modulePath);
-
-		Local<Object> moduleObj;
-
 		auto isData = false;
 
-		if (it == s_loadedModules.end())
-		{
-			moduleObj = Load(modulePath, isData);
-		}
-		else
-		{
-			moduleObj = Local<Object>::New(isolate, *it->second);
-		}
+		auto moduleObj = Load(modulePath, isData);
 
 		if (isData)
 		{
@@ -202,20 +191,30 @@ Local<Object> Module::Load(const string& path, bool& isData)
 
 	auto isolate = Isolate::GetCurrent();
 
-	if (Util::EndsWith(path, ".js") || Util::EndsWith(path, ".so"))
-	{
-		isData = false;
-		result = LoadModule(isolate, path);
-	}
-	else if (Util::EndsWith(path, ".json"))
+	auto it = s_loadedModules.find(path);
+
+	if (it == s_loadedModules.end())
 	{
-		isData = true;
-		result = LoadData(isolate, path);
+		if (Util::EndsWith(path, ".js") || Util::EndsWith(path, ".so"))
+		{
+			isData = false;
+			result = LoadModule(isolate, path);
+		}
+		else if (Util::EndsWith(path, ".json"))
+		{
+			isData = true;
+			result = LoadData(isolate, path);
+		}
+		else
+		{
+			string errMsg = "Unsupported file extension: " + path;
+			throw NativeScriptException(errMsg);
+		}
 	}
 	else
 	{
-		string errMsg = "Unsupported file extension: " + path;
-		throw NativeScriptException(errMsg);
+		isData = Util::EndsWith(path, ".json");
+		result = Local<Object>::New(isolate, *it->second);
 	}
 
 	return result;