Archives/Athou_commafeed
1
0
Fork 1
mirror of https://github.com/Athou/commafeed.git synced 2026-03-21 21:37:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove predestroy responsability from startupbean

Browse Source
This commit is contained in:
Athou
2013-05-24 16:50:00 +02:00
parent 01b8087e43
commit bb4ce2e0e4
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/commafeed/backend/StartupBean.java
View File

@@ -27,7 +27,6 @@ import com.commafeed.backend.dao.FeedCategoryDAO;
import com.commafeed.backend.dao.FeedDAO; import com.commafeed.backend.dao.FeedDAO;
import com.commafeed.backend.dao.FeedSubscriptionDAO; import com.commafeed.backend.dao.FeedSubscriptionDAO;
import com.commafeed.backend.dao.UserDAO; import com.commafeed.backend.dao.UserDAO;
import com.commafeed.backend.feeds.FeedRefreshUpdater;
import com.commafeed.backend.feeds.FeedRefreshWorker; import com.commafeed.backend.feeds.FeedRefreshWorker;
import com.commafeed.backend.model.ApplicationSettings; import com.commafeed.backend.model.ApplicationSettings;
import com.commafeed.backend.model.UserRole.Role; import com.commafeed.backend.model.UserRole.Role;
@@ -62,9 +61,6 @@ public class StartupBean {
@Inject @Inject
ApplicationSettingsService applicationSettingsService; ApplicationSettingsService applicationSettingsService;
@Inject
FeedRefreshUpdater feedRefreshUpdater;
@Inject @Inject
Instance<FeedRefreshWorker> workers; Instance<FeedRefreshWorker> workers;
@@ -149,7 +145,6 @@ public class StartupBean {
log.error("interrupted while waiting for threads to finish."); log.error("interrupted while waiting for threads to finish.");
} }
} }
feedRefreshUpdater.shutdown();
} }
} }

2
src/main/java/com/commafeed/backend/feeds/FeedRefreshUpdater.java
View File

@@ -8,6 +8,7 @@ import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import javax.annotation.PostConstruct; import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
import javax.inject.Inject; import javax.inject.Inject;
import javax.inject.Singleton; import javax.inject.Singleton;
@@ -78,6 +79,7 @@ public class FeedRefreshUpdater {
}); });
} }
@PreDestroy
public void shutdown() { public void shutdown() {
pool.shutdownNow(); pool.shutdownNow();
while (!pool.isTerminated()) { while (!pool.isTerminated()) {