git://git.nikiroo.be
/
fanfix.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add an ID for the server requests
[fanfix.git]
/
src
/
be
/
nikiroo
/
utils
/
serial
/
server
/
ServerBridge.java
diff --git
a/src/be/nikiroo/utils/serial/server/ServerBridge.java
b/src/be/nikiroo/utils/serial/server/ServerBridge.java
index cb06f56369054deb8ab06b6a1e201c7ac1611e62..84433fe9d4f9516c90acaf39d6359fce1e1e25b8 100644
(file)
--- a/
src/be/nikiroo/utils/serial/server/ServerBridge.java
+++ b/
src/be/nikiroo/utils/serial/server/ServerBridge.java
@@
-227,14
+227,14
@@
public class ServerBridge extends Server {
try {
while (data.startsWith("ZIP:") || data.startsWith("B64:")) {
if (data.startsWith("ZIP:")) {
try {
while (data.startsWith("ZIP:") || data.startsWith("B64:")) {
if (data.startsWith("ZIP:")) {
- data = StringUtils.un
base64s(data.substring(4), true
);
+ data = StringUtils.un
zip64s(data.substring(4)
);
} else if (data.startsWith("B64:")) {
} else if (data.startsWith("B64:")) {
- data = StringUtils.un
base64s(data.substring(4), false
);
+ data = StringUtils.un
zip64s(data.substring(4)
);
}
}
InputStream stream = new ByteArrayInputStream(
}
}
InputStream stream = new ByteArrayInputStream(
-
data.getBytes("UTF-8"
));
+
StringUtils.getBytes(data
));
try {
Object obj = new Importer().read(stream).getValue();
if (obj == null) {
try {
Object obj = new Importer().read(stream).getValue();
if (obj == null) {