Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew M. Finkbeiner2016-12-03 19:23:49 -0500
committerAndrew M. Finkbeiner2016-12-04 11:05:11 -0500
commit7a1f687c5cfe02e51a01f7de83e8053e8d88c8d7 (patch)
tree6a90018992e9c90f16fc527500ad78e394edc49f
parent1ed0028ccab788ab19af931e66a3fcd46056f4dd (diff)
downloadorg.eclipse.osee-7a1f687c5cfe02e51a01f7de83e8053e8d88c8d7.tar.gz
org.eclipse.osee-7a1f687c5cfe02e51a01f7de83e8053e8d88c8d7.tar.xz
org.eclipse.osee-7a1f687c5cfe02e51a01f7de83e8053e8d88c8d7.zip
bug[ats_ATS326992]: Test Servers not getting unregistered correctly
-rw-r--r--plugins/org.eclipse.osee.ote.master.rest.client/src/org/eclipse/osee/ote/master/rest/client/internal/RemoveServer.java7
1 files changed, 4 insertions, 3 deletions
diff --git a/plugins/org.eclipse.osee.ote.master.rest.client/src/org/eclipse/osee/ote/master/rest/client/internal/RemoveServer.java b/plugins/org.eclipse.osee.ote.master.rest.client/src/org/eclipse/osee/ote/master/rest/client/internal/RemoveServer.java
index e1caf94368..b91f43fd11 100644
--- a/plugins/org.eclipse.osee.ote.master.rest.client/src/org/eclipse/osee/ote/master/rest/client/internal/RemoveServer.java
+++ b/plugins/org.eclipse.osee.ote.master.rest.client/src/org/eclipse/osee/ote/master/rest/client/internal/RemoveServer.java
@@ -5,7 +5,6 @@ import java.net.URI;
import java.util.concurrent.Callable;
import java.util.logging.Level;
-import javax.ws.rs.HttpMethod;
import javax.ws.rs.core.UriBuilder;
import org.eclipse.osee.framework.logging.OseeLog;
@@ -29,10 +28,12 @@ public class RemoveServer implements Callable<OTEMasterServerResult> {
public OTEMasterServerResult call() throws Exception {
OTEMasterServerResult result = new OTEMasterServerResult();
try {
+ URI mainTarget =
+ UriBuilder.fromUri(uri).path(OTEMasterServerImpl.CONTEXT_NAME).path(OTEMasterServerImpl.CONTEXT_SERVERS).build();
URI targetUri =
UriBuilder.fromUri(uri).path(OTEMasterServerImpl.CONTEXT_NAME).path(OTEMasterServerImpl.CONTEXT_SERVERS).path(server.getUUID().toString()).build();
- if(HttpUtil.canConnect(targetUri)){
- webClientProvider.target(targetUri).request().method(HttpMethod.DELETE);
+ if(HttpUtil.canConnect(mainTarget)){
+ webClientProvider.target(targetUri).request().delete();
} else {
result.setSuccess(false);
}

Back to the top