dorkbox/Network
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Cleaned up local channel registration

Browse Source
This commit is contained in:
nathan 2018-03-28 20:18:34 +02:00
parent f889399ecf
commit 68cd0071a6
3 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/dorkbox/network/connection/registration/local/RegistrationLocalHandler.java
View File

@ -43,8 +43,6 @@ class RegistrationLocalHandler extends RegistrationHandler {
.set(metaChannel);
logger.trace("New LOCAL connection.");
registrationWrapper.connection0(metaChannel, null);
}
@Override

10
src/dorkbox/network/connection/registration/local/RegistrationLocalHandlerClient.java
View File

@ -32,14 +32,6 @@ class RegistrationLocalHandlerClient extends RegistrationLocalHandler {
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
*/
@ -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.
registrationWrapper.startNextProtocolRegistration();
registrationWrapper.connection0(metaChannel, null);
ConnectionImpl connection = metaChannel.connection;
// have to setup connection handler
pipeline.addLast(CONNECTION_HANDLER, connection);
registrationWrapper.connectionConnected0(connection);
}
else {

9
src/dorkbox/network/connection/registration/local/RegistrationLocalHandlerServer.java
View File

@ -31,14 +31,6 @@ class RegistrationLocalHandlerServer extends RegistrationLocalHandler {
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)
*/
@ -73,6 +65,7 @@ class RegistrationLocalHandlerServer extends RegistrationLocalHandler {
MetaChannel metaChannel = channel.attr(META_CHANNEL)
.getAndSet(null);
if (metaChannel != null) {
registrationWrapper.connection0(metaChannel, null);
ConnectionImpl connection = metaChannel.connection;
if (connection != null) {