diff options
3 files changed, 6 insertions, 4 deletions
diff --git a/document/src/main/java/com/yahoo/document/DocumentType.java b/document/src/main/java/com/yahoo/document/DocumentType.java index a616c853bf4..f3ff6e4ed30 100755 --- a/document/src/main/java/com/yahoo/document/DocumentType.java +++ b/document/src/main/java/com/yahoo/document/DocumentType.java @@ -328,8 +328,8 @@ public class DocumentType extends StructuredDataType { /** * Gets the field matching a given name. * - * @param name The name of a field. - * @return Returns the matching field, or null if not found. + * @param name the name of a field. + * @return returns the matching field, or null if not found. */ public Field getField(String name) { Field field = headerType.getField(name); diff --git a/document/src/main/java/com/yahoo/document/json/readers/VespaJsonDocumentReader.java b/document/src/main/java/com/yahoo/document/json/readers/VespaJsonDocumentReader.java index 7e32a6b8b44..3ab9f72504b 100644 --- a/document/src/main/java/com/yahoo/document/json/readers/VespaJsonDocumentReader.java +++ b/document/src/main/java/com/yahoo/document/json/readers/VespaJsonDocumentReader.java @@ -117,6 +117,8 @@ public class VespaJsonDocumentReader { private void addFieldUpdates(DocumentUpdate update, TokenBuffer buffer, String fieldName) { Field field = update.getType().getField(fieldName); + if (field == null) + throw new IllegalArgumentException("No field named '" + fieldName + "' in " + update.getType()); int localNesting = buffer.nesting(); FieldUpdate fieldUpdate = FieldUpdate.create(field); diff --git a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/operationProcessor/DocumentSendInfo.java b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/operationProcessor/DocumentSendInfo.java index 0952837ecc4..883cea7e6f0 100644 --- a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/operationProcessor/DocumentSendInfo.java +++ b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/operationProcessor/DocumentSendInfo.java @@ -9,7 +9,7 @@ import java.util.Map; /** * Keeps an overview of what is sent and what is received for an operation. - * This class is NOT thread-safe. + * This class is not thread-safe. */ class DocumentSendInfo { @@ -30,7 +30,7 @@ class DocumentSendInfo { if (detailByClusterId.containsKey(clusterId)) { if (localTrace != null) { localTrace.append(System.currentTimeMillis() + " Got duplicate detail, ignoring this: " - + detail.toString() + "\n"); + + detail.toString() + "\n"); } return false; } |