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

[miio] fix bundle restart error #10190

Merged
merged 1 commit into from
Feb 25, 2021
Merged

[miio] fix bundle restart error #10190

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 26 additions & 4 deletions ...nhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/MiIoHandlerFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
import static org.openhab.binding.miio.internal.MiIoBindingConstants.*;

import java.util.Map;
import java.util.concurrent.Future;
import java.util.concurrent.RejectedExecutionException;
import java.util.concurrent.ScheduledExecutorService;

import org.eclipse.jdt.annotation.NonNullByDefault;
Expand All @@ -35,7 +37,10 @@
import org.openhab.core.thing.type.ChannelTypeRegistry;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Deactivate;
import org.osgi.service.component.annotations.Reference;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

/**
* The {@link MiIoHandlerFactory} is responsible for creating things and thing
Expand All @@ -49,17 +54,20 @@ public class MiIoHandlerFactory extends BaseThingHandlerFactory {
private static final String THING_HANDLER_THREADPOOL_NAME = "thingHandler";
protected final ScheduledExecutorService scheduler = ThreadPoolManager
.getScheduledPool(THING_HANDLER_THREADPOOL_NAME);

private MiIoDatabaseWatchService miIoDatabaseWatchService;
private CloudConnector cloudConnector;
private ChannelTypeRegistry channelTypeRegistry;
private BasicChannelTypeProvider basicChannelTypeProvider;
private @Nullable Future<Boolean> scheduledTask;
private final Logger logger = LoggerFactory.getLogger(MiIoHandlerFactory.class);

@Activate
public MiIoHandlerFactory(@Reference ChannelTypeRegistry channelTypeRegistry,
@Reference MiIoDatabaseWatchService miIoDatabaseWatchService, @Reference CloudConnector cloudConnector,
@Reference BasicChannelTypeProvider basicChannelTypeProvider, Map<String, Object> properties) {
this.miIoDatabaseWatchService = miIoDatabaseWatchService;
this.channelTypeRegistry = channelTypeRegistry;
this.basicChannelTypeProvider = basicChannelTypeProvider;
this.cloudConnector = cloudConnector;
@Nullable
String username = (String) properties.get("username");
Expand All @@ -68,9 +76,23 @@ public MiIoHandlerFactory(@Reference ChannelTypeRegistry channelTypeRegistry,
@Nullable
String country = (String) properties.get("country");
cloudConnector.setCredentials(username, password, country);
scheduler.submit(() -> cloudConnector.isConnected());
this.channelTypeRegistry = channelTypeRegistry;
this.basicChannelTypeProvider = basicChannelTypeProvider;
try {
if (!scheduler.isShutdown()) {
scheduledTask = scheduler.submit(() -> cloudConnector.isConnected());
} else {
logger.debug("Unexpected: ScheduledExecutorService is shutdown.");
}
} catch (RejectedExecutionException e) {
logger.debug("Unexpected: ScheduledExecutorService task rejected.", e);
}
}

@Deactivate
private void dispose() {
final Future<Boolean> scheduledTask = this.scheduledTask;
if (scheduledTask != null && !scheduledTask.isDone()) {
scheduledTask.cancel(true);
}
}

@Override
Expand Down