diff options
author | Harald Musum <musum@oath.com> | 2018-10-29 19:52:13 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-29 19:52:13 +0100 |
commit | 27a98339d105f0ef7b3cd7397379e251115f8f60 (patch) | |
tree | dc809780a7fefd5ce92655c381852bbfc72e0880 /vespaclient-core/src/main/java/com/yahoo/feedapi/Feeder.java | |
parent | 3caf9568a1c69b4ce79b4df6d9fcaeb313cd80d8 (diff) |
Revert "Also obey the timeout."
Diffstat (limited to 'vespaclient-core/src/main/java/com/yahoo/feedapi/Feeder.java')
-rw-r--r-- | vespaclient-core/src/main/java/com/yahoo/feedapi/Feeder.java | 7 |
1 files changed, 5 insertions, 2 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 a1440a1ff32..e354cba141d 100644 --- a/vespaclient-core/src/main/java/com/yahoo/feedapi/Feeder.java +++ b/vespaclient-core/src/main/java/com/yahoo/feedapi/Feeder.java @@ -78,7 +78,7 @@ public abstract class Feeder { return errors; } - while (!sender.isAborted() && !sender.hasTimedOut()) { + while (!sender.isAborted()) { try { VespaXMLFeedReader.Operation op = new VespaXMLFeedReader.Operation(); reader.read(op); @@ -92,7 +92,10 @@ public abstract class Feeder { } else { sender.sendOperation(op); } - } catch (XMLStreamException | NullPointerException e) { + } catch (XMLStreamException e) { + addException(e); + break; + } catch (NullPointerException e) { addException(e); break; } catch (Exception e) { |