From b77077828e0ca9da8d7fca630c460400cc347f70 Mon Sep 17 00:00:00 2001
From: Athou <jeremiepanzer@gmail.com>
Date: Tue, 2 Jul 2013 10:14:47 +0200
Subject: [PATCH] catch potential exception (timeout) when subscribing

---
 .../com/commafeed/backend/feeds/OPMLImporter.java   | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/commafeed/backend/feeds/OPMLImporter.java b/src/main/java/com/commafeed/backend/feeds/OPMLImporter.java
index ab392971..e62691f9 100644
--- a/src/main/java/com/commafeed/backend/feeds/OPMLImporter.java
+++ b/src/main/java/com/commafeed/backend/feeds/OPMLImporter.java
@@ -17,6 +17,7 @@ import com.commafeed.backend.dao.FeedCategoryDAO;
 import com.commafeed.backend.model.FeedCategory;
 import com.commafeed.backend.model.User;
 import com.commafeed.backend.services.FeedSubscriptionService;
+import com.commafeed.backend.services.FeedSubscriptionService.FeedSubscriptionException;
 import com.sun.syndication.feed.opml.Opml;
 import com.sun.syndication.feed.opml.Outline;
 import com.sun.syndication.io.WireFeedInput;
@@ -76,8 +77,16 @@ public class OPMLImporter {
 			if (StringUtils.isBlank(title)) {
 				title = "Unnamed subscription";
 			}
-			feedSubscriptionService.subscribe(user, outline.getXmlUrl(), title,
-					parent);
+
+			// make sure we continue with the import process even a feed failed
+			try {
+				feedSubscriptionService.subscribe(user, outline.getXmlUrl(), title,
+						parent);
+			} catch (FeedSubscriptionException e) {
+				throw e;
+			} catch (Exception e) {
+				log.error("error while importing {}: {}", outline.getXmlUrl(), e.getMessage());
+			}
 		}
 	}
 }