You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by mi...@apache.org on 2014/07/26 12:22:10 UTC
[23/32] git commit: Use commons codec's Base64 in an Android-friendly
way
Use commons codec's Base64 in an Android-friendly way
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/da8bb92e
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/da8bb92e
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/da8bb92e
Branch: refs/heads/OLINGO-377-FIT
Commit: da8bb92e3e43803598ae88099ee2fab9029466d3
Parents: 6d51eef
Author: Francesco Chicchiriccò <--global>
Authored: Fri Jul 25 12:04:53 2014 +0200
Committer: Francesco Chicchiriccò <--global>
Committed: Fri Jul 25 12:04:53 2014 +0200
----------------------------------------------------------------------
.../main/java/org/apache/olingo/ext/proxy/AbstractService.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/da8bb92e/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/AbstractService.java
----------------------------------------------------------------------
diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/AbstractService.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/AbstractService.java
index 7519e47..d6124bd 100644
--- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/AbstractService.java
+++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/AbstractService.java
@@ -69,7 +69,8 @@ public abstract class AbstractService<C extends CommonEdmEnabledODataClient<?>>
ObjectInputStream ois = null;
XMLMetadata metadata = null;
try {
- bais = new ByteArrayInputStream(Base64.decodeBase64(compressedMetadata));
+ // use commons codec's Base64 in this fashion to stay compatible with Android
+ bais = new ByteArrayInputStream(new Base64().decode(compressedMetadata.getBytes("UTF-8")));
gzis = new GZIPInputStream(bais);
ois = new ObjectInputStream(gzis);
metadata = (XMLMetadata) ois.readObject();