Browse Source

Fix race condition in StreamCopyThread

If we get an interrupt during an IO operation (src.read or dst.write)
caused by the flush() method incrementing the flush counter, ensure
we restart the proper section of code.  Just ignore the interrupt
and continue running.

Bug: 313082
Change-Id: Ib2b37901af8141289bbac9807cacf42b4e2461bd
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
tags/v0.8.1
Dmitry Neverov 14 years ago
parent
commit
b3247ba524

+ 2
- 8
org.eclipse.jgit/src/org/eclipse/jgit/util/io/StreamCopyThread.java View File

try { try {
n = src.read(buf); n = src.read(buf);
} catch (InterruptedIOException wakey) { } catch (InterruptedIOException wakey) {
if (flushCounter.get() > 0)
continue;
else
throw wakey;
continue;
} }
if (n < 0) if (n < 0)
break; break;
try { try {
dst.write(buf, 0, n); dst.write(buf, 0, n);
} catch (InterruptedIOException wakey) { } catch (InterruptedIOException wakey) {
if (flushCounter.get() > 0)
continue;
else
throw wakey;
continue;
} }
break; break;
} }

Loading…
Cancel
Save