diff options
| author | Robert Godfrey <rgodfrey@apache.org> | 2011-10-06 18:11:25 +0000 |
|---|---|---|
| committer | Robert Godfrey <rgodfrey@apache.org> | 2011-10-06 18:11:25 +0000 |
| commit | 596d6b92823db1356667cfefbc02faab5b857648 (patch) | |
| tree | b41121811fd155f3115fc7188b4f1a0b9e735bec | |
| parent | ee4289af49a88d083f8acc70a9a5c7e20561b063 (diff) | |
| download | qpid-python-596d6b92823db1356667cfefbc02faab5b857648.tar.gz | |
NO-JIRA: AMQP-1-0 demo code fixes
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/rg-amqp-1-0-sandbox@1179732 13f79535-47bb-0310-9956-ffa450edef68
3 files changed, 4 insertions, 4 deletions
diff --git a/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Demo.java b/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Demo.java index ad127ffc1a..b58ce6bfe5 100644 --- a/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Demo.java +++ b/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Demo.java @@ -241,8 +241,7 @@ public class Demo extends Util try{
- Connection conn2 = new Connection(host, port, user, password,
- "development.mycompany.mysystem.stormmq.com");
+ Connection conn2 = new Connection(host, port, user, password, host);
Session session2 = conn2.createSession();
if(sendingLinks.containsKey(linkRef))
{
diff --git a/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Util.java b/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Util.java index ed553bf769..6fe2a6d510 100644 --- a/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Util.java +++ b/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Util.java @@ -502,9 +502,9 @@ public abstract class Util { Container container = getContainerName() == null ? new Container() : new Container(getContainerName()); return getUsername() == null ? new Connection(getHost(), getPort(), null, null, _frameSize, container, - _remoteHost, _useSSL) + _remoteHost == null ? getHost() : _remoteHost, _useSSL) : new Connection(getHost(), getPort(), getUsername(), getPassword(), _frameSize, - container, _remoteHost, _useSSL); + container, _remoteHost == null ? getHost() : _remoteHost, _useSSL); } public String getContainerName() diff --git a/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/ConnectionEndpoint.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/ConnectionEndpoint.java index e0225a5be4..d44d1f52ef 100644 --- a/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/ConnectionEndpoint.java +++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/ConnectionEndpoint.java @@ -766,6 +766,7 @@ public class ConnectionEndpoint implements DescribedTypeConstructorRegistry.Sour {
SaslInit init = new SaslInit();
init.setMechanism(Symbol.valueOf("PLAIN"));
+ init.setHostname(_remoteHostname);
byte[] usernameBytes = _user.getName().getBytes(Charset.forName("UTF-8"));
byte[] passwordBytes = _password.getBytes(Charset.forName("UTF-8"));
byte[] initResponse = new byte[usernameBytes.length+passwordBytes.length+2];
|