Return X-Vespa-Ignored-Fields if fields were ignored

1 files changed, 4 insertions, 13 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 cd888b11d64..d8b69bd4a85 100644
--- a/vespaclient-core/src/main/java/com/yahoo/feedapi/Feeder.java
+++ b/vespaclient-core/src/main/java/com/yahoo/feedapi/Feeder.java
@@ -52,9 +52,8 @@ public abstract class Feeder {
             StringWriter sw = new StringWriter();
             PrintWriter pw = new PrintWriter(sw);
             e.printStackTrace(pw);
-            message = "(no message) " + sw.toString();
+            message = "(no message) " + sw;
         }
-
         addError("ERROR: " + message);
     }
 
@@ -84,17 +83,9 @@ public abstract class Feeder {
                 if (createIfNonExistent && op.getDocumentUpdate() != null) {
                     op.getDocumentUpdate().setCreateIfNonExistent(true);
                 }
-
-                // Done feeding.
-                if (op.getType() == FeedOperation.Type.INVALID) {
-                    break;
-                } else {
-                    sender.sendOperation(op);
-                }
-            } catch (XMLStreamException e) {
-                addException(e);
-                break;
-            } catch (NullPointerException e) {
+                if (op.getType() == FeedOperation.Type.INVALID) break; // Done feeding
+                sender.sendOperation(op);
+            } catch (XMLStreamException | NullPointerException e) {
                 addException(e);
                 break;
             } catch (Exception e) {