summaryrefslogtreecommitdiffstats
path: root/controller-server/src
diff options
context:
space:
mode:
authorJon Marius Venstad <jvenstad@yahoo-inc.com>2018-09-24 13:44:13 +0200
committerJon Marius Venstad <jvenstad@yahoo-inc.com>2018-09-24 13:44:13 +0200
commit64f36e530db94f80e9358f06434c70a4dacdf84e (patch)
treecbdb698076a82f4f3f71936dd3ea4c2fa597e22a /controller-server/src
parentcc782b77ca881294f5d3d9e8d0ecbd58c2d28808 (diff)
Remove redundant code
Diffstat (limited to 'controller-server/src')
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java10
1 files changed, 4 insertions, 6 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java
index 955faeb3e51..ad1e4ded76f 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java
@@ -526,12 +526,10 @@ public class ApplicationController {
*/
public void deleteApplication(ApplicationId applicationId, Optional<NToken> token) {
// Find all instances of the application
- List<ApplicationId> instances = controller.applications().asList(applicationId.tenant())
- .stream()
- .map(Application::id)
- .filter(id -> id.application().equals(applicationId.application()) &&
- id.tenant().equals(applicationId.tenant()))
- .collect(Collectors.toList());
+ List<ApplicationId> instances = asList(applicationId.tenant()).stream()
+ .map(Application::id)
+ .filter(id -> id.application().equals(applicationId.application()))
+ .collect(Collectors.toList());
if (instances.isEmpty()) {
throw new NotExistsException("Could not delete application '" + applicationId + "': Application not found");
}