Merge "Merge branch 'stable-4.11' into stable-5.0" into stable-5.1
This commit is contained in:
commit
4728a32699
|
@ -124,13 +124,18 @@ public void onWritePossible() throws IOException {
|
|||
} else {
|
||||
buffer.flip();
|
||||
}
|
||||
} catch(Throwable t) {
|
||||
} catch (Throwable t) {
|
||||
LOG.log(Level.SEVERE, t.getMessage(), t);
|
||||
buffer = null;
|
||||
} finally {
|
||||
if (buffer != null) {
|
||||
outChannel.write(buffer);
|
||||
} else {
|
||||
try {
|
||||
in.close();
|
||||
} catch (IOException e) {
|
||||
LOG.log(Level.SEVERE, e.getMessage(), e);
|
||||
}
|
||||
try {
|
||||
out.close();
|
||||
} finally {
|
||||
|
|
Loading…
Reference in New Issue