Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix MqttServer Duplicate handler name: idle #101

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

fix MqttServer Duplicate handler name: idle #101

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d5fecba
fix MqttServer Duplicate handler name: idle
dushibaiyu Jun 11, 2018
93c88e1
Override IdleTimeout to fix Error
dushibaiyu Jun 15, 2018
0ca8271
fix commit
dushibaiyu Jun 15, 2018
0ae1f37
rm space
dushibaiyu Jun 15, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions src/main/java/io/vertx/mqtt/MqttServerOptions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,10 +252,29 @@ public MqttServerOptions setTimeoutOnConnect(int timeoutOnConnect) {
return this;
}

/**
* Do the same thing as {@link MqttClientOptions#setKeepAliveTimeSeconds(int)}. Use it instead.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do the same thing as {@link MqttClientOptions#setTimeoutOnConnect(int)}. Use it instead.

*/
@Deprecated
@Override
public MqttServerOptions setIdleTimeout(int idleTimeout) {
super.setIdleTimeout(0);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why calling the super method here? I think we should not do this.

return setTimeoutOnConnect(idleTimeout);
}


Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And please remove one empty line here.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok

/**
* @return timeout on CONNECT before closing connection
*/
public int timeoutOnConnect() {
return this.timeoutOnConnect;
}

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you remove the line?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dushibaiyu , don't forget to remove the line, please.

/**
* @return the TCP idle timeout, in seconds,In MqttServer the Parameter should be 0, it will use timeoutOnConnect.
*/
@Override
public int getIdleTimeout() {
return 0;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why returning 0 here? The method will return zero by default.

And, thinking about it... I think we can also delegate the method call to MqttServerOptions#timeoutOnConnect

}
}
1 change: 1 addition & 0 deletions src/main/java/io/vertx/mqtt/impl/MqttServerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,5 +154,6 @@ public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exc
}
}
});

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you please remove this line? Since it is not related to the PR

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok

}
}