diff options
| author | Robert Godfrey <rgodfrey@apache.org> | 2014-08-25 14:48:20 +0000 |
|---|---|---|
| committer | Robert Godfrey <rgodfrey@apache.org> | 2014-08-25 14:48:20 +0000 |
| commit | 2a7c8b3061fda47cc53ef997c339599dd2285395 (patch) | |
| tree | 40334230aa105819bb4e1bc0ea7794e39050c64b /qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Connection_1_0.java | |
| parent | 717bfa2e17d949bf0771ca14fb15bc99dd41f9fd (diff) | |
| download | qpid-python-2a7c8b3061fda47cc53ef997c339599dd2285395.tar.gz | |
Merging from trunk r1616861:1617235 in the Java tree
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.30@1620330 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Connection_1_0.java')
| -rw-r--r-- | qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Connection_1_0.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Connection_1_0.java b/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Connection_1_0.java index ffa65b2477..2a48ccb2df 100644 --- a/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Connection_1_0.java +++ b/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Connection_1_0.java @@ -62,7 +62,7 @@ import org.apache.qpid.server.virtualhost.VirtualHostImpl; public class Connection_1_0 implements ConnectionEventListener, AMQConnectionModel<Connection_1_0,Session_1_0> { - private final Port _port; + private final Port<?> _port; private final Broker _broker; private final SubjectCreator _subjectCreator; private VirtualHostImpl _vhost; @@ -358,7 +358,7 @@ public class Connection_1_0 implements ConnectionEventListener, AMQConnectionMod } @Override - public Port getPort() + public Port<?> getPort() { return _port; } |