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

various tweaks

Browse Source
This commit is contained in:
Athou
2013-05-22 21:56:22 +02:00
parent fe16a2a7e2
commit 58501bbfb1
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/commafeed/backend/services/FeedSubscriptionService.java
View File

@@ -2,7 +2,6 @@ package com.commafeed.backend.services;
import java.util.List; import java.util.List;
import javax.ejb.Stateless;
import javax.ejb.ApplicationException; import javax.ejb.ApplicationException;
import javax.inject.Inject; import javax.inject.Inject;
@@ -18,7 +17,6 @@ import com.commafeed.backend.model.FeedSubscription;
import com.commafeed.backend.model.User; import com.commafeed.backend.model.User;
import com.google.api.client.util.Lists; import com.google.api.client.util.Lists;
@Stateless
public class FeedSubscriptionService { public class FeedSubscriptionService {
@SuppressWarnings("serial") @SuppressWarnings("serial")
@@ -53,7 +51,7 @@ public class FeedSubscriptionService {
final String pubUrl = applicationSettingsService.get().getPublicUrl(); final String pubUrl = applicationSettingsService.get().getPublicUrl();
if (pubUrl == null) { if (pubUrl == null) {
throw new FeedSubscriptionException( throw new FeedSubscriptionException(
"Public URL of this CommaFeed is unset"); "Public URL of this CommaFeed instance is not set");
} }
if (url.startsWith(pubUrl)) { if (url.startsWith(pubUrl)) {
throw new FeedSubscriptionException( throw new FeedSubscriptionException(

2
src/main/java/com/commafeed/frontend/rest/resources/PubSubHubbubCallbackREST.java
View File

@@ -94,7 +94,7 @@ public class PubSubHubbubCallbackREST {
} }
} }
} catch (Exception e) { } catch (Exception e) {
log.debug("Could not parse pubsub callback: " + e.getMessage(), e); log.error("Could not parse pubsub callback: " + e.getMessage());
} }
return Response.ok().build(); return Response.ok().build();
} }