summaryrefslogtreecommitdiffstats
path: root/branches/sca-java-1.x/modules/binding-atom-abdera
diff options
context:
space:
mode:
Diffstat (limited to 'branches/sca-java-1.x/modules/binding-atom-abdera')
-rw-r--r--branches/sca-java-1.x/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingInvoker.java8
-rw-r--r--branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/data/collection/AggregatorTestCase.java2
2 files changed, 8 insertions, 2 deletions
diff --git a/branches/sca-java-1.x/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingInvoker.java b/branches/sca-java-1.x/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingInvoker.java
index 7dd85a79d9..3deb26feb1 100644
--- a/branches/sca-java-1.x/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingInvoker.java
+++ b/branches/sca-java-1.x/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingInvoker.java
@@ -357,7 +357,13 @@ class AtomBindingInvoker implements Invoker {
if (status == 200) {
Document<Feed> doc = abderaParser.parse(new InputStreamReader(getMethod.getResponseBodyAsStream()));
parsing = true;
- Feed feed = doc.getRoot();
+
+ Feed feed = null;
+ try {
+ feed = doc.getRoot();
+ } catch(Exception e) {
+ throw new IllegalArgumentException("Invalid feed format :" + uri);
+ }
if (provider.supportsFeedEntries()) {
diff --git a/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/data/collection/AggregatorTestCase.java b/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/data/collection/AggregatorTestCase.java
index b7937c14c6..49f1207f31 100644
--- a/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/data/collection/AggregatorTestCase.java
+++ b/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/data/collection/AggregatorTestCase.java
@@ -53,7 +53,7 @@ public class AggregatorTestCase {
new Socket("127.0.0.1", 8085);
}
- @Ignore
+ @Ignore("TUSCANY-2939")
public void testAggregator() throws Exception {
Entry<String, Item>[] entries = aggregatorService.getAll();