Commit 849bdd48 authored by Dele Olajide's avatar Dele Olajide

Fix bamboo build failure from s2s fixes merge

parent a9632df8
...@@ -49,6 +49,10 @@ public class RemoteComponentSession extends RemoteSession implements ComponentSe ...@@ -49,6 +49,10 @@ public class RemoteComponentSession extends RemoteSession implements ComponentSe
component = new RemoteExternalComponent(address); component = new RemoteExternalComponent(address);
} }
public String getCipherSuiteName() {
return "NONE";
}
public ExternalComponent getExternalComponent() { public ExternalComponent getExternalComponent() {
return component; return component;
} }
......
...@@ -35,6 +35,10 @@ public class RemoteConnectionMultiplexerSession extends RemoteSession implements ...@@ -35,6 +35,10 @@ public class RemoteConnectionMultiplexerSession extends RemoteSession implements
super(nodeID, address); super(nodeID, address);
} }
public String getCipherSuiteName() {
return "NONE";
}
RemoteSessionTask getRemoteSessionTask(RemoteSessionTask.Operation operation) { RemoteSessionTask getRemoteSessionTask(RemoteSessionTask.Operation operation) {
return new ConnectionMultiplexerSessionTask(address, operation); return new ConnectionMultiplexerSessionTask(address, operation);
} }
......
...@@ -35,12 +35,25 @@ import java.util.Collection; ...@@ -35,12 +35,25 @@ import java.util.Collection;
public class RemoteIncomingServerSession extends RemoteSession implements IncomingServerSession { public class RemoteIncomingServerSession extends RemoteSession implements IncomingServerSession {
private String localDomain; private String localDomain;
private long usingServerDialback = -1;
public RemoteIncomingServerSession(byte[] nodeID, String streamID) { public RemoteIncomingServerSession(byte[] nodeID, String streamID) {
super(nodeID, null); super(nodeID, null);
this.streamID = new BasicStreamID(streamID); this.streamID = new BasicStreamID(streamID);
} }
public String getCipherSuiteName() {
return "NONE";
}
public boolean isUsingServerDialback() {
if (usingServerDialback == -1) {
ClusterTask task = getRemoteSessionTask(RemoteSessionTask.Operation.isUsingServerDialback);
usingServerDialback = (Boolean) doSynchronousClusterTask(task) ? 1 : 0;
}
return usingServerDialback == 1;
}
public JID getAddress() { public JID getAddress() {
if (address == null) { if (address == null) {
RemoteSessionTask task = getRemoteSessionTask(RemoteSessionTask.Operation.getAddress); RemoteSessionTask task = getRemoteSessionTask(RemoteSessionTask.Operation.getAddress);
......
...@@ -43,6 +43,10 @@ public class RemoteOutgoingServerSession extends RemoteSession implements Outgoi ...@@ -43,6 +43,10 @@ public class RemoteOutgoingServerSession extends RemoteSession implements Outgoi
super(nodeID, address); super(nodeID, address);
} }
public String getCipherSuiteName() {
return "NONE";
}
public Collection<String> getAuthenticatedDomains() { public Collection<String> getAuthenticatedDomains() {
ClusterTask task = getRemoteSessionTask(RemoteSessionTask.Operation.getAuthenticatedDomains); ClusterTask task = getRemoteSessionTask(RemoteSessionTask.Operation.getAuthenticatedDomains);
return (Collection<String>) doSynchronousClusterTask(task); return (Collection<String>) doSynchronousClusterTask(task);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment