Sync bndlib code
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1381708 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/bundleplugin/src/main/java/aQute/lib/json/ByteArrayHandler.java b/bundleplugin/src/main/java/aQute/lib/json/ByteArrayHandler.java
index a336e97..7622ae7 100644
--- a/bundleplugin/src/main/java/aQute/lib/json/ByteArrayHandler.java
+++ b/bundleplugin/src/main/java/aQute/lib/json/ByteArrayHandler.java
@@ -4,17 +4,17 @@
import java.lang.reflect.*;
import java.util.*;
-import aQute.lib.base64.*;
import aQute.lib.hex.*;
+/**
+ *
+ * Will now use hex for encoding byte arrays
+ *
+ */
public class ByteArrayHandler extends Handler {
-
@Override
void encode(Encoder app, Object object, Map<Object,Type> visited) throws IOException, Exception {
- if ( app.codec.isHex())
- StringHandler.string(app, Hex.toHexString((byte[]) object));
- else
- StringHandler.string(app, Base64.encodeBase64((byte[]) object));
+ StringHandler.string(app, Hex.toHexString((byte[]) object));
}
@Override
@@ -31,8 +31,6 @@
@Override
Object decode(Decoder dec, String s) throws Exception {
- if ( dec.codec.isHex())
- return Hex.toByteArray(s);
- return Base64.decodeBase64(s);
+ return Hex.toByteArray(s);
}
}