Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix module loading

This commit is contained in:
Wilfried Goesgens 2015-09-25 16:24:17 +02:00
parent 3ce21453c3
commit 06b0057bb1
1 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
js/common/bootstrap/modules.js
View File

@ -375,19 +375,37 @@ Module._load = function(request, parent, isMain) {
var filename = request;
var dbModule = false;
try {
filename = Module._resolveFilename(request, parent);
} catch (e) {
if (!request.startsWith('db://')) {
try {
filename = Module._resolveFilename(request, parent);
} catch (e) {
if (request.charAt(0) !== '/') {
request = '/' + request;
}
dbModule = Module._dbCache[request];
if (!dbModule) {
dbModule = internal.db._modules.firstExample({path: request});
if (!dbModule) {
throw e;
}
Module._dbCache[request] = dbModule;
}
}
}
else {
if (request.charAt(0) !== '/') {
request = '/' + request;
}
dbModule = Module._dbCache[request];
if (!dbModule) {
dbModule = internal.db._modules.firstExample({path: request});
if (!dbModule) {
throw e;
if (dbModule) {
Module._dbCache[request] = dbModule;
}
else {
throw new Error("failed to locate module " + request + " in _modules!");
}
Module._dbCache[request] = dbModule;
}
}