summaryrefslogtreecommitdiffstats
path: root/vespaclient-core
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2018-10-29 15:35:40 +0100
committerGitHub <noreply@github.com>2018-10-29 15:35:40 +0100
commit58a26cf97e7b787f843587f5189cbbfce244fcb6 (patch)
treefd4a4216add207a7777035be10c373fb77451984 /vespaclient-core
parent4db0fa8fd704173603f10c040cd6abbfcfe1a769 (diff)
parentf4919f91210ce016947c052e9fcdeb23e3b4e54d (diff)
Merge pull request #7480 from vespa-engine/balder/catch-and-abort-on-NullPointerException
Catch and abort on NullPointerException.
Diffstat (limited to 'vespaclient-core')
-rw-r--r--vespaclient-core/src/main/java/com/yahoo/feedapi/Feeder.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/vespaclient-core/src/main/java/com/yahoo/feedapi/Feeder.java b/vespaclient-core/src/main/java/com/yahoo/feedapi/Feeder.java
index 4ad5c86b663..e354cba141d 100644
--- a/vespaclient-core/src/main/java/com/yahoo/feedapi/Feeder.java
+++ b/vespaclient-core/src/main/java/com/yahoo/feedapi/Feeder.java
@@ -95,6 +95,9 @@ public abstract class Feeder {
} catch (XMLStreamException e) {
addException(e);
break;
+ } catch (NullPointerException e) {
+ addException(e);
+ break;
} catch (Exception e) {
addException(e);
if (doAbort) {