Attachment 267232 Details for Bug 513584 – proposed fix

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] proposed fix

getproject.subproject.patch (text/plain), 1.14 KB, created by Michael Rennie

on 2017-03-13 13:00:35 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Rennie

Created: 2017-03-13 13:00:35 EDT

Size: 1.14 KB

patch

obsolete

>diff --git a/modules/orionode/lib/file.js b/modules/orionode/lib/file.js
>index 3c72cd6..8e1f4ae 100755
>--- a/modules/orionode/lib/file.js
>+++ b/modules/orionode/lib/file.js
>@@ -165,7 +165,7 @@
> 			n.forEach(function(item) {
> 				names[decodeURIComponent(item)] = Object.create(null);
> 			});
>-			return fileUtil.getProject(req.user.workspaceDir, fileRoot, filepath, names).then(function(project) {
>+			return fileUtil.getProject(req.user.workspaceDir, fileRoot, filepath, {names: names}).then(function(project) {
> 				return fileUtil.withStatsAndETag(project, function(error, stats, etag) {
> 					if (error && error.code === 'ENOENT') {
> 						res.sendStatus(204);
>diff --git a/modules/orionode/lib/fileUtil.js b/modules/orionode/lib/fileUtil.js
>index a589ef3..c01ae14 100644
>--- a/modules/orionode/lib/fileUtil.js
>+++ b/modules/orionode/lib/fileUtil.js
>@@ -148,7 +148,7 @@
> 				for(var i = 0, len = children.length; i < len; i++) {
> 					var c = children[i],
> 						n = names[c.Name];
>-					if(n && (c.Directory && n.isDirectory)) {
>+					if(n && (c.Directory && n.isDirectory || !c.Directory && !n.isDirectory)) {
> 						return resolve(filepath);
> 					}
> 				}

Actions: View | Diff

Attachments on bug 513584: 267232