diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2017-11-13 11:53:09 +0100 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2017-11-13 11:53:09 +0100 |
commit | 0477084b81811a66992f5a33bec8fe6c02f195ea (patch) | |
tree | 07d60061a48054043002f6c6043739434260ab47 | |
parent | 8d21d85b340a57b0d1f6626b7d3d41c86eecf938 (diff) |
No longer necessary to loop as no more deletion of default tenant will take place.
-rw-r--r-- | configserver/src/test/java/com/yahoo/vespa/config/server/deploy/DeployTester.java | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/DeployTester.java b/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/DeployTester.java index 557a4332ef5..d9a0db7e811 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/DeployTester.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/DeployTester.java @@ -103,15 +103,7 @@ public class DeployTester { } public Tenant tenant() { - Tenant tenant = tenants.defaultTenant(); - // TODO Retry since there is some code removing/updating the default tenant which should not be done. - while (tenant == null) { - try { - Thread.sleep(1); - } catch (InterruptedException e) {} - tenant = tenants.defaultTenant(); - } - return tenant; + return tenants.defaultTenant(); } /** Create a model factory for the version of this source*/ |