garrettmills/commafeed
1
0
Fork 0
forked from Archives/Athou_commafeed
Code Pull Requests Activity

jklm initial implementation

Browse Source
This commit is contained in:
Athou
2013-05-24 09:21:20 +02:00
parent 89ffd89a31
commit 4ba0ed4bf7
3 changed files with 31 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,7 +14,6 @@ import javax.inject.Singleton;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.commafeed.backend.LockMap;
import com.commafeed.backend.dao.FeedDAO;
import com.commafeed.backend.dao.FeedSubscriptionDAO;
import com.commafeed.backend.model.ApplicationSettings;
@@ -26,13 +25,17 @@ import com.commafeed.backend.pubsubhubbub.SubscriptionHandler;
import com.commafeed.backend.services.ApplicationSettingsService;
import com.commafeed.backend.services.FeedUpdateService;
import de.jkeylockmanager.manager.KeyLockManager;
import de.jkeylockmanager.manager.KeyLockManagers;
import de.jkeylockmanager.manager.LockCallback;
@Singleton
public class FeedRefreshUpdater {
protected static Logger log = LoggerFactory
.getLogger(FeedRefreshUpdater.class);
private static LockMap<String> lockMap = new LockMap<String>();
private static final KeyLockManager lockManager = KeyLockManagers.newLock();
@Inject
FeedUpdateService feedUpdateService;
@@ -107,11 +110,14 @@ public class FeedRefreshUpdater {
}
private void updateEntry(Feed feed, FeedEntry entry,
List<FeedSubscription> subscriptions) {
synchronized (lockMap.get(entry.getGuid())) {
feedUpdateService.updateEntry(feed, entry, subscriptions);
}
private void updateEntry(final Feed feed, final FeedEntry entry,
final List<FeedSubscription> subscriptions) {
lockManager.executeLocked(entry.getGuid(), new LockCallback() {
@Override
public void doInLock() throws Exception {
feedUpdateService.updateEntry(feed, entry, subscriptions);
}
});
}
private void handlePubSub(final Feed feed) {

5
src/main/java/com/commafeed/backend/services/UserService.java
View File

@@ -46,8 +46,9 @@ public class UserService {
PasswordEncryptionService encryptionService;
public User login(String name, String password) {
Preconditions.checkNotNull(name);
Preconditions.checkNotNull(password);
if (name == null || password == null) {
return null;
}
User user = userDAO.findByName(name);
if (user != null && !user.isDisabled()) {