diff options
| author | Keith Wall <kwall@apache.org> | 2014-01-13 11:43:52 +0000 |
|---|---|---|
| committer | Keith Wall <kwall@apache.org> | 2014-01-13 11:43:52 +0000 |
| commit | e24fe7cc76a6ac23417d7d8fb83829ca69e156dc (patch) | |
| tree | 68e69c13c3fa67f7d576fd46cc3c37f0b85d348b /qpid/java/broker-core | |
| parent | 992bc4eb0986ecbda44d662b53e28ab9ac2b066d (diff) | |
| download | qpid-python-e24fe7cc76a6ac23417d7d8fb83829ca69e156dc.tar.gz | |
QPID-5472: [Java Broker] Connection model object attribute PORT should return the name of the Port
* Added REST system test for the above
* Also addressed review comments from Andrew MacBean (namely, HttpManagement#stop should chain the underlying exception).
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1557683 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/broker-core')
| -rw-r--r-- | qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Connection.java | 1 | ||||
| -rw-r--r-- | qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/ConnectionAdapter.java | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Connection.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Connection.java index 3139850892..31d40c7c3e 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Connection.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Connection.java @@ -79,6 +79,7 @@ public interface Connection extends ConfiguredObject public static final String REMOTE_PROCESS_PID = "remoteProcessPid"; public static final String SESSION_COUNT_LIMIT = "sessionCountLimit"; public static final String TRANSPORT = "transport"; + /** Name of port associated with the connection */ public static final String PORT = "port"; diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/ConnectionAdapter.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/ConnectionAdapter.java index e8bacb2712..dd5fc67b48 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/ConnectionAdapter.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/ConnectionAdapter.java @@ -35,6 +35,7 @@ import org.apache.qpid.protocol.AMQConstant; import org.apache.qpid.server.model.ConfiguredObject; import org.apache.qpid.server.model.Connection; import org.apache.qpid.server.model.LifetimePolicy; +import org.apache.qpid.server.model.Port; import org.apache.qpid.server.model.Session; import org.apache.qpid.server.model.State; import org.apache.qpid.server.model.Statistics; @@ -226,7 +227,8 @@ final class ConnectionAdapter extends AbstractAdapter implements Connection } else if(name.equals(PORT)) { - return String.valueOf(_connection.getPort()); + Port port = _connection.getPort(); + return String.valueOf(port == null ? null : port.getName()); } return super.getAttribute(name); } |