git://git.nikiroo.be
/
nikiroo-utils.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
VERSION + fix custom image
[nikiroo-utils.git]
/
src
/
be
/
nikiroo
/
utils
/
serial
/
SerialUtils.java
diff --git
a/src/be/nikiroo/utils/serial/SerialUtils.java
b/src/be/nikiroo/utils/serial/SerialUtils.java
index 52bc43aae85c054d03466c2e171f2f1bbfd7c8f1..a6a02a8e06205cb5996b0a94c1124056ce2cbf60 100644
(file)
--- a/
src/be/nikiroo/utils/serial/SerialUtils.java
+++ b/
src/be/nikiroo/utils/serial/SerialUtils.java
@@
-174,7
+174,8
@@
public class SerialUtils {
in.close();
}
} finally {
in.close();
}
} finally {
- encoded.close();
+ encoded.flush();
+ // Cannot close!
}
}
}
}
@@
-186,7
+187,9
@@
public class SerialUtils {
@Override
protected Object fromStream(InputStream in) throws IOException {
try {
@Override
protected Object fromStream(InputStream in) throws IOException {
try {
- return new Image(in);
+ // Cannot close it!
+ InputStream decoded = StringUtils.unbase64(in, false);
+ return new Image(decoded);
} catch (IOException e) {
throw new UnknownFormatConversionException(e.getMessage());
}
} catch (IOException e) {
throw new UnknownFormatConversionException(e.getMessage());
}