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 NPE #126

Merged
merged 2 commits into from
Jan 15, 2020
Merged

fix NPE #126

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
893797b
fix NPE
gitseti Jan 8, 2020
6f22891
Merge remote-tracking branch 'origin/develop' into fix-npe
gitseti Jan 15, 2020
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
26 changes: 13 additions & 13 deletions src/main/java/com/hivemq/cli/commands/shell/ContextSubscribeCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,13 +133,10 @@ private void stay() throws InterruptedException {
latch.countDown();
};

final Runnable waitForExitCommandRunnable = new Runnable() {
@Override
public void run() {
final Scanner scanner = new Scanner(System.in);
scanner.nextLine();
latch.countDown();
}
final Runnable waitForExitCommandRunnable = () -> {
final Scanner scanner = new Scanner(System.in);
scanner.nextLine();
latch.countDown();
};

final ExecutorService WORKER_THREADS = Executors.newFixedThreadPool(2);
Expand All @@ -151,19 +148,22 @@ public void run() {

WORKER_THREADS.shutdownNow();

if (!contextClient.getState().isConnectedOrReconnect()) {
removeContext();
}
else {
mqttClientExecutor.unsubscribe(contextClient, this);
if (contextClient != null) {
if (!contextClient.getState().isConnectedOrReconnect()) {
removeContext();
}
else {
mqttClientExecutor.unsubscribe(contextClient, this);
}
}


}

@Override
public String toString() {
return getClass().getSimpleName() + "{" +
"key=" + getKey() +
"key=" + ((contextClient == null)? "null" : getKey()) +
", topics=" + Arrays.toString(topics) +
", qos=" + Arrays.toString(qos) +
", outputToConsole=" + printToSTDOUT +
Expand Down