Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew M. Finkbeiner2016-12-05 15:08:36 -0500
committerAndrew M. Finkbeiner2016-12-05 15:08:36 -0500
commitcdf9f5af145874b1f18adc74f0510cb42ad3c971 (patch)
treeebfdc7abc83693bde544e908d8ad5ede1dfb81b6
parent7a1f687c5cfe02e51a01f7de83e8053e8d88c8d7 (diff)
downloadorg.eclipse.osee-cdf9f5af145874b1f18adc74f0510cb42ad3c971.tar.gz
org.eclipse.osee-cdf9f5af145874b1f18adc74f0510cb42ad3c971.tar.xz
org.eclipse.osee-cdf9f5af145874b1f18adc74f0510cb42ad3c971.zip
bug[ats_ATS327008]: OTE Test Manager can control multiple test servers at the same time including other user's
-rw-r--r--plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/OTETestEnvironmentClient.java5
-rw-r--r--plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/endpoint/OteUdpEndpoint.java2
-rw-r--r--plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/internal/endpoint/EndpointComponent.java11
3 files changed, 16 insertions, 2 deletions
diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/OTETestEnvironmentClient.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/OTETestEnvironmentClient.java
index ee73362815..3793434fd0 100644
--- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/OTETestEnvironmentClient.java
+++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/OTETestEnvironmentClient.java
@@ -141,6 +141,7 @@ public class OTETestEnvironmentClient {
ser.getHeader().RESPONSE_TOPIC.setValue(SerializedOTEJobStatus.EVENT);
OteEndpointSendEventMessage sendit = new OteEndpointSendEventMessage(service, destinationAddress);
+ service.removeBroadcast(null);
service.addBroadcast(service.getOteEndpointSender(destinationAddress));//so we can communicate via console before connect
WaitForCompletion completion = new WaitForCompletion(monitor);
final OteEventMessageFuture<SerializedConfigurationAndResponse, SerializedOTEJobStatus> asynchSendAndResponse = sendit.asynchSendAndMultipleResponse(SerializedOTEJobStatus.class, ser, completion, 1000 * 60 * 10);
@@ -375,11 +376,13 @@ public class OTETestEnvironmentClient {
SerializedDisconnectRemoteTestEnvironment req = new SerializedDisconnectRemoteTestEnvironment(new DisconnectRemoteTestEnvironment(sessionId));
OteEndpointSendEventMessage sendit = new OteEndpointSendEventMessage(service, destinationAddress);
sendit.asynchSend(req);
+ if(service != null){
+ service.removeBroadcast(service.getOteEndpointSender(destinationAddress));
+ }
} catch (IOException e) {
e.printStackTrace();
}
}
-
}
diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/endpoint/OteUdpEndpoint.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/endpoint/OteUdpEndpoint.java
index 52e2c3e30f..e391134433 100644
--- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/endpoint/OteUdpEndpoint.java
+++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/endpoint/OteUdpEndpoint.java
@@ -16,6 +16,8 @@ public interface OteUdpEndpoint {
public void addBroadcast(OteUdpEndpointSender sender);
public void removeBroadcast(OteUdpEndpointSender sender);
+
+// public void clearBroadcast();
public CopyOnWriteNoIteratorList<OteUdpEndpointSender> getBroadcastSenders();
diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/internal/endpoint/EndpointComponent.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/internal/endpoint/EndpointComponent.java
index fe247740b0..579060d7cb 100644
--- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/internal/endpoint/EndpointComponent.java
+++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/internal/endpoint/EndpointComponent.java
@@ -133,7 +133,16 @@ public class EndpointComponent implements OteUdpEndpoint {
@Override
public void removeBroadcast(OteUdpEndpointSender sender) {
- broadcastThreaded.remove(sender);
+ if(sender == null){
+ broadcastThreaded.clear();
+ } else {
+ broadcastThreaded.remove(sender);
+ }
}
+
+// @Override
+// public void clearBroadcast() {
+// broadcastThreaded.clear();
+// }
}

Back to the top