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
Merge commit '679c6a1f7a9a13c186af996349e23fc97ac20997'
[fanfix.git]
/
src
/
be
/
nikiroo
/
utils
/
Image.java
diff --git
a/src/be/nikiroo/utils/Image.java
b/src/be/nikiroo/utils/Image.java
index 4518577d640b684bee939381e02b9aa745b2d3a2..9b28835e0fd61585023edf83db5ba19dea0030db 100644
(file)
--- a/
src/be/nikiroo/utils/Image.java
+++ b/
src/be/nikiroo/utils/Image.java
@@
-116,7
+116,13
@@
public class Image implements Closeable, Serializable {
* in case of I/O error
*/
public InputStream newInputStream() throws IOException {
* in case of I/O error
*/
public InputStream newInputStream() throws IOException {
- return new MarkableFileInputStream(data);
+ synchronized (instanceLock) {
+ if (data == null) {
+ throw new IOException("Image was close()d");
+ }
+
+ return new MarkableFileInputStream(data);
+ }
}
/**
}
/**
@@
-175,6
+181,7
@@
public class Image implements Closeable, Serializable {
@Override
public void close() throws IOException {
synchronized (instanceLock) {
@Override
public void close() throws IOException {
synchronized (instanceLock) {
+ new Exception().printStackTrace();
if (size >= 0) {
size = -1;
data.delete();
if (size >= 0) {
size = -1;
data.delete();