CHE-891: Initialize projects from unconfigured folders on starting WS…

…-agent
eclipse-che · Mar 28, 2016 · 3dfb6d1 · 3dfb6d1
1 parent 3af60fc
commit 3dfb6d1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/...he-core-api-project/src/main/java/org/eclipse/che/api/project/server/ProjectRegistry.java b/...he-core-api-project/src/main/java/org/eclipse/che/api/project/server/ProjectRegistry.java
@@ -200,7 +200,7 @@ RegisteredProject putProject(ProjectConfig config,
                                  boolean detected) throws ServerException,
                                                           ConflictException,
                                                           NotFoundException {
-        final RegisteredProject project = new RegisteredProject(folder, config, updated, detected, this.projectTypeRegistry);
+        final RegisteredProject project = new RegisteredProject(folder, config, updated, detected, projectTypeRegistry);
         Optional<RegisteredProject> updatedProjectOptional = Optional.ofNullable(projects.put(project.getPath(), project));
 
         // check whether it isn't during #initProjects()
@@ -210,6 +210,9 @@ RegisteredProject putProject(ProjectConfig config,
             } else {
                 workspaceHolder.addProject(project);
             }
+        } else if (config == null) {
+            // initializing project from unconfigured folder during #initProjects()
+            workspaceHolder.addProject(project);
         }
 
         return project;

diff --git a/...he-core-api-project/src/main/java/org/eclipse/che/api/project/server/WorkspaceHolder.java b/...he-core-api-project/src/main/java/org/eclipse/che/api/project/server/WorkspaceHolder.java
@@ -121,7 +121,6 @@ void updateProject(RegisteredProject project) throws ServerException {
             return;
         }
 
-        // TODO workspace.addProject(project); but replace
         workspace.updateProject(project);
 
         final String href = UriBuilder.fromUri(apiEndpoint)
-Original file line number
+Diff line change
@@ Expand Up @@
                 return;
             }
-            // TODO workspace.addProject(project); but replace
             workspace.updateProject(project);
             final String href = UriBuilder.fromUri(apiEndpoint)
@@ Expand Down @@