| commit | 55d4dfefeeeecd8f9591a49b6b6a90689bd4cf55 | [log] [tgz] |
|---|---|---|
| author | Stuart McCulloch <mcculls@apache.org> | Tue Aug 07 10:57:21 2012 +0000 |
| committer | Stuart McCulloch <mcculls@apache.org> | Tue Aug 07 10:57:21 2012 +0000 |
| tree | 88ddcc7f62c6107d7335fe7476f42b9c7d414724 | |
| parent | 5e1031ab5c89080e4f4c40b2109d7afb634e1953 [diff] |
Latest bnd sync git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1370165 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 957369f..a336e97 100644 --- a/bundleplugin/src/main/java/aQute/lib/json/ByteArrayHandler.java +++ b/bundleplugin/src/main/java/aQute/lib/json/ByteArrayHandler.java
@@ -33,7 +33,6 @@ Object decode(Decoder dec, String s) throws Exception { if ( dec.codec.isHex()) return Hex.toByteArray(s); - else - return Base64.decodeBase64(s); + return Base64.decodeBase64(s); } }
diff --git a/bundleplugin/src/main/java/aQute/lib/json/Encoder.java b/bundleplugin/src/main/java/aQute/lib/json/Encoder.java index 0808de3..034ea6a 100644 --- a/bundleplugin/src/main/java/aQute/lib/json/Encoder.java +++ b/bundleplugin/src/main/java/aQute/lib/json/Encoder.java
@@ -92,6 +92,7 @@ return this; } + @Override public String toString() { return app.toString(); }
diff --git a/bundleplugin/src/main/java/aQute/lib/json/StringHandler.java b/bundleplugin/src/main/java/aQute/lib/json/StringHandler.java index ba62a13..47a4eab 100644 --- a/bundleplugin/src/main/java/aQute/lib/json/StringHandler.java +++ b/bundleplugin/src/main/java/aQute/lib/json/StringHandler.java
@@ -83,6 +83,7 @@ * An object can be assigned to a string. This means that the stream is * interpreted as the object but stored in its complete in the string. */ + @Override Object decodeObject(Decoder r) throws Exception { return collect(r, '}'); }