diff options
| author | Andrew Donald Kennedy <grkvlt@apache.org> | 2010-12-06 16:05:46 +0000 |
|---|---|---|
| committer | Andrew Donald Kennedy <grkvlt@apache.org> | 2010-12-06 16:05:46 +0000 |
| commit | 80ba5c5efdc23e3922b8f8f5152ceeaefa6951b6 (patch) | |
| tree | 2eb2141eb77d43701e718b5b5ab1cbd07401015f /qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java | |
| parent | 1d44d6e7a3369fb7773ba50d02c3baa8955da382 (diff) | |
| download | qpid-python-grkvlt-network-20101013.tar.gz | |
Attempt one at merge from r1021441:HEADgrkvlt-network-20101013
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/grkvlt-network-20101013@1042697 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java')
| -rw-r--r-- | qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java index f1407b8770..580fe8e834 100644 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java +++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java @@ -55,6 +55,7 @@ import org.apache.qpid.server.security.auth.manager.PrincipalDatabaseAuthenticat import org.apache.qpid.server.virtualhost.VirtualHost; import org.apache.qpid.server.virtualhost.VirtualHostImpl; import org.apache.qpid.server.virtualhost.VirtualHostRegistry; +import org.apache.qpid.transport.network.IncomingNetworkTransport; import org.apache.qpid.transport.network.NetworkTransport; /** @@ -71,7 +72,7 @@ public abstract class ApplicationRegistry implements IApplicationRegistry protected final ServerConfiguration _configuration; - protected final Map<Integer, NetworkTransport> _transports = new HashMap<Integer, NetworkTransport>(); + protected final Map<Integer, IncomingNetworkTransport> _transports = new HashMap<Integer, IncomingNetworkTransport>(); protected ManagedObjectRegistry _managedObjectRegistry; @@ -374,12 +375,12 @@ public abstract class ApplicationRegistry implements IApplicationRegistry try { transport.close(); + CurrentActor.get().message(BrokerMessages.SHUTTING_DOWN(transport.getAddress().toString(), port)); } catch (Throwable e) { _logger.error("Unable to close network driver due to:" + e.getMessage()); } - CurrentActor.get().message(BrokerMessages.SHUTTING_DOWN(transport.getAddress().toString(), port)); } } } @@ -389,7 +390,7 @@ public abstract class ApplicationRegistry implements IApplicationRegistry return _configuration; } - public void registerTransport(int port, NetworkTransport transport) + public void registerTransport(int port, IncomingNetworkTransport transport) { synchronized (_transports) { |