Merge pull request #3661 from eclipse/3589-fix

Revert WorkspaceService#getByNamespace functionality
eclipse-che · Jan 11, 2017 · a3acaf6 · a3acaf6
2 parents 6ad6ea4 + 7453402
commit a3acaf6
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/...re-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/WorkspaceManager.java b/...re-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/WorkspaceManager.java
@@ -259,7 +259,7 @@ public List<WorkspaceImpl> getByNamespace(String namespace) throws ServerExcepti
         requireNonNull(namespace, "Required non-null namespace");
         final List<WorkspaceImpl> workspaces = workspaceDao.getByNamespace(namespace);
         for (WorkspaceImpl workspace : workspaces) {
-            workspace.setStatus(runtimes.getStatus(workspace.getId()));
+            normalizeState(workspace);
         }
         return workspaces;
     }

diff --git a/...pi-workspace/src/test/java/org/eclipse/che/api/workspace/server/WorkspaceManagerTest.java b/...pi-workspace/src/test/java/org/eclipse/che/api/workspace/server/WorkspaceManagerTest.java
@@ -856,7 +856,6 @@ private RuntimeDescriptor createAndMockDescriptor(WorkspaceImpl workspace, Works
             throws ServerException, NotFoundException, ConflictException {
         RuntimeDescriptor descriptor = createDescriptor(workspace, status);
         when(runtimes.get(workspace.getId())).thenReturn(descriptor);
-        when(runtimes.getStatus(workspace.getId())).thenReturn(status);
         return descriptor;
     }