Cleaned up local channel registration
This commit is contained in:
parent
f889399ecf
commit
68cd0071a6
@ -43,8 +43,6 @@ class RegistrationLocalHandler extends RegistrationHandler {
|
|||||||
.set(metaChannel);
|
.set(metaChannel);
|
||||||
|
|
||||||
logger.trace("New LOCAL connection.");
|
logger.trace("New LOCAL connection.");
|
||||||
|
|
||||||
registrationWrapper.connection0(metaChannel, null);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -32,14 +32,6 @@ class RegistrationLocalHandlerClient extends RegistrationLocalHandler {
|
|||||||
super(name, registrationWrapper);
|
super(name, registrationWrapper);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* STEP 1: Channel is first created
|
|
||||||
*/
|
|
||||||
// Calls the super class to init the local channel
|
|
||||||
// @Override
|
|
||||||
// protected void initChannel(Channel channel) {
|
|
||||||
// }
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* STEP 2: Channel is now active. Start the registration process
|
* STEP 2: Channel is now active. Start the registration process
|
||||||
*/
|
*/
|
||||||
@ -75,11 +67,13 @@ class RegistrationLocalHandlerClient extends RegistrationLocalHandler {
|
|||||||
// Event though a local channel is XOR with everything else, we still have to make the client clean up it's state.
|
// Event though a local channel is XOR with everything else, we still have to make the client clean up it's state.
|
||||||
registrationWrapper.startNextProtocolRegistration();
|
registrationWrapper.startNextProtocolRegistration();
|
||||||
|
|
||||||
|
registrationWrapper.connection0(metaChannel, null);
|
||||||
ConnectionImpl connection = metaChannel.connection;
|
ConnectionImpl connection = metaChannel.connection;
|
||||||
|
|
||||||
// have to setup connection handler
|
// have to setup connection handler
|
||||||
pipeline.addLast(CONNECTION_HANDLER, connection);
|
pipeline.addLast(CONNECTION_HANDLER, connection);
|
||||||
|
|
||||||
|
|
||||||
registrationWrapper.connectionConnected0(connection);
|
registrationWrapper.connectionConnected0(connection);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
@ -31,14 +31,6 @@ class RegistrationLocalHandlerServer extends RegistrationLocalHandler {
|
|||||||
super(name, registrationWrapper);
|
super(name, registrationWrapper);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* STEP 1: Channel is first created
|
|
||||||
*/
|
|
||||||
// Calls the super class to init the local channel
|
|
||||||
// @Override
|
|
||||||
// protected void initChannel(Channel channel) {
|
|
||||||
// }
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* STEP 2: Channel is now active. Start the registration process (Client starts the process)
|
* STEP 2: Channel is now active. Start the registration process (Client starts the process)
|
||||||
*/
|
*/
|
||||||
@ -73,6 +65,7 @@ class RegistrationLocalHandlerServer extends RegistrationLocalHandler {
|
|||||||
MetaChannel metaChannel = channel.attr(META_CHANNEL)
|
MetaChannel metaChannel = channel.attr(META_CHANNEL)
|
||||||
.getAndSet(null);
|
.getAndSet(null);
|
||||||
if (metaChannel != null) {
|
if (metaChannel != null) {
|
||||||
|
registrationWrapper.connection0(metaChannel, null);
|
||||||
ConnectionImpl connection = metaChannel.connection;
|
ConnectionImpl connection = metaChannel.connection;
|
||||||
|
|
||||||
if (connection != null) {
|
if (connection != null) {
|
||||||
|
Loading…
Reference in New Issue
Block a user