From 9fc5cee6fe10943965d67e9aab59d5f5a582d6ea Mon Sep 17 00:00:00 2001
From: Risto Kankkunen <risto.kankkunen@iki.fi>
Date: Mon, 20 May 2013 22:10:44 +0300
Subject: [PATCH] Avoid a NPE if the public URL is not set.

--HG--
extra : rebase_source : 9b98f856d10dff6cb19bbaf90fb7eb22336aea7f
---
 .../commafeed/backend/services/FeedSubscriptionService.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/commafeed/backend/services/FeedSubscriptionService.java b/src/main/java/com/commafeed/backend/services/FeedSubscriptionService.java
index 00ba09ed..54c342f7 100644
--- a/src/main/java/com/commafeed/backend/services/FeedSubscriptionService.java
+++ b/src/main/java/com/commafeed/backend/services/FeedSubscriptionService.java
@@ -41,7 +41,11 @@ public class FeedSubscriptionService {
 	public Feed subscribe(User user, String url, String title,
 			FeedCategory category) {
 
-		if (url.startsWith(applicationSettingsService.get().getPublicUrl())) {
+		final String pubUrl = applicationSettingsService.get().getPublicUrl();
+		if (pubUrl == null) {
+			throw new RuntimeException("Public URL of this CommaFeed is unset");
+		}
+		if (url.startsWith(pubUrl)) {
 			throw new RuntimeException(
 					"Could not subscribe to a feed from this CommaFeed instance");
 		}