summaryrefslogtreecommitdiffstats
path: root/vespajlib
diff options
context:
space:
mode:
authorJon Marius Venstad <venstad@gmail.com>2020-09-22 16:38:43 +0200
committerJon Marius Venstad <venstad@gmail.com>2020-09-24 21:38:03 +0200
commit7d280adf22a83d5446153820a42258d352418269 (patch)
tree543d8d33a186f4cd15b60e53441b7aa8a6cf83bd /vespajlib
parentba878c027385ac2db61dd849d39705c704786f62 (diff)
Use NOT_FOUND in DocumentResponse as well — as success
Diffstat (limited to 'vespajlib')
-rw-r--r--vespajlib/src/main/java/com/yahoo/io/ByteWriter.java2
-rw-r--r--vespajlib/src/main/java/com/yahoo/slime/SlimeUtils.java6
2 files changed, 6 insertions, 2 deletions
diff --git a/vespajlib/src/main/java/com/yahoo/io/ByteWriter.java b/vespajlib/src/main/java/com/yahoo/io/ByteWriter.java
index 05f7cec9189..de9c88a713d 100644
--- a/vespajlib/src/main/java/com/yahoo/io/ByteWriter.java
+++ b/vespajlib/src/main/java/com/yahoo/io/ByteWriter.java
@@ -11,7 +11,7 @@ import java.nio.charset.CharsetEncoder;
/**
* A buffered writer which accepts byte arrays in addition to character arrays.
*
- * @author <a href="mailt:steinar@yahoo-inc.com">Steinar Knutsen</a>
+ * @author Steinar Knutsen
*/
public class ByteWriter extends AbstractByteWriter {
private final OutputStream stream;
diff --git a/vespajlib/src/main/java/com/yahoo/slime/SlimeUtils.java b/vespajlib/src/main/java/com/yahoo/slime/SlimeUtils.java
index 51a4fc167c7..144a9a585f6 100644
--- a/vespajlib/src/main/java/com/yahoo/slime/SlimeUtils.java
+++ b/vespajlib/src/main/java/com/yahoo/slime/SlimeUtils.java
@@ -94,8 +94,12 @@ public class SlimeUtils {
}
public static byte[] toJsonBytes(Slime slime) throws IOException {
+ return toJsonBytes(slime.get());
+ }
+
+ public static byte[] toJsonBytes(Inspector inspector) throws IOException {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
- new JsonFormat(true).encode(baos, slime);
+ new JsonFormat(true).encode(baos, inspector);
return baos.toByteArray();
}