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

use a onetomany relationship for push info to avoid hibernate automatic lazy loading of onetoone optional relationships

Browse Source
This commit is contained in:
Athou
2013-05-30 10:24:30 +02:00
parent 84a8566af4
commit 0aee6850d5
6 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,6 +29,7 @@ import com.commafeed.backend.model.FeedSubscription;
import com.commafeed.backend.pubsubhubbub.SubscriptionHandler;
import com.commafeed.backend.services.ApplicationSettingsService;
import com.commafeed.backend.services.FeedUpdateService;
import com.google.common.collect.Iterables;
import com.google.common.util.concurrent.Striped;
@Singleton
@@ -157,7 +158,7 @@ public class FeedRefreshUpdater {
}
private void handlePubSub(final Feed feed) {
FeedPushInfo info = feed.getPushInfo();
FeedPushInfo info = Iterables.getFirst(feed.getPushInfo(), null);
if (info != null && info.isActive() == false) {
new Thread() {
@Override

6
src/main/java/com/commafeed/backend/feeds/FeedRefreshWorker.java
View File

@@ -18,6 +18,7 @@ import com.commafeed.backend.model.FeedEntry;
import com.commafeed.backend.model.FeedPushInfo;
import com.commafeed.backend.services.ApplicationSettingsService;
import com.commafeed.backend.services.FeedPushInfoService;
import com.google.common.collect.Iterables;
import com.sun.syndication.io.FeedException;
public class FeedRefreshWorker {
@@ -85,7 +86,6 @@ public class FeedRefreshWorker {
private void update(Feed feed) {
try {
FetchedFeed fetchedFeed = fetcher.fetch(feed.getUrl(), false,
feed.getLastModifiedHeader(), feed.getEtagHeader());
@@ -156,11 +156,11 @@ public class FeedRefreshWorker {
topic = "http://" + topic;
}
log.debug("feed {} has pubsub info: {}", feed.getUrl(), topic);
FeedPushInfo info = feed.getPushInfo();
FeedPushInfo info = Iterables.getFirst(feed.getPushInfo(), null);
if (info == null) {
info = feedPushInfoService.findOrCreate(feed, hub, topic);
feed.getPushInfo().add(info);
}
feed.setPushInfo(info);
}
}