Author: rgodfrey
Date: Fri May 2 07:33:30 2014
New Revision: 1591819
URL: http://svn.apache.org/r1591819
Log:
QPID-5673 : merge to 0.28 branch
Modified:
qpid/branches/0.28/qpid/java/ (props changed)
qpid/branches/0.28/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/ConnectionEndpoint.java
qpid/branches/0.28/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Connection_1_0.java
Propchange: qpid/branches/0.28/qpid/java/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java:r1586780,1591649
Modified:
qpid/branches/0.28/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/ConnectionEndpoint.java
URL:
http://svn.apache.org/viewvc/qpid/branches/0.28/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/ConnectionEndpoint.java?rev=1591819&r1=1591818&r2=1591819&view=diff
==============================================================================
---
qpid/branches/0.28/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/ConnectionEndpoint.java
(original)
+++
qpid/branches/0.28/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/ConnectionEndpoint.java
Fri May 2 07:33:30 2014
@@ -398,6 +398,8 @@ public class ConnectionEndpoint implemen
switch (_state)
{
case UNOPENED:
+ sendOpen((short)0,0);
+ sendClose(close);
_state = ConnectionState.CLOSED;
break;
case AWAITING_OPEN:
Modified:
qpid/branches/0.28/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Connection_1_0.java
URL:
http://svn.apache.org/viewvc/qpid/branches/0.28/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Connection_1_0.java?rev=1591819&r1=1591818&r2=1591819&view=diff
==============================================================================
---
qpid/branches/0.28/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Connection_1_0.java
(original)
+++
qpid/branches/0.28/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Connection_1_0.java
Fri May 2 07:33:30 2014
@@ -133,7 +133,6 @@ public class Connection_1_0 implements C
host = (String)_broker.getAttribute(Broker.DEFAULT_VIRTUAL_HOST);
}
_vhost = _broker.getVirtualHostRegistry().getVirtualHost(host);
- _vhost.getConnectionRegistry().registerConnection(this);
if(_vhost == null)
{
@@ -142,11 +141,14 @@ public class Connection_1_0 implements C
err.setDescription("Unknown hostname " + _conn.getLocalHostname());
_conn.close(err);
}
- Subject authSubject =
_subjectCreator.createSubjectWithGroups(_conn.getUser());
- _subject.getPrincipals().addAll(authSubject.getPrincipals());
-
_subject.getPublicCredentials().addAll(authSubject.getPublicCredentials());
-
_subject.getPrivateCredentials().addAll(authSubject.getPrivateCredentials());
-
+ else
+ {
+ _vhost.getConnectionRegistry().registerConnection(this);
+ Subject authSubject =
_subjectCreator.createSubjectWithGroups(_conn.getUser());
+ _subject.getPrincipals().addAll(authSubject.getPrincipals());
+
_subject.getPublicCredentials().addAll(authSubject.getPublicCredentials());
+
_subject.getPrivateCredentials().addAll(authSubject.getPrivateCredentials());
+ }
}
public void remoteSessionCreation(SessionEndpoint endpoint)
@@ -217,7 +219,10 @@ public class Connection_1_0 implements C
{
_closeTasks.clear();
}
- _vhost.getConnectionRegistry().deregisterConnection(this);
+ if(_vhost != null)
+ {
+ _vhost.getConnectionRegistry().deregisterConnection(this);
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
