Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,10 @@ protected void abortOutputRequested(
{
channel.engine.abortOutput(channel, abortFuture);
}
else
{
abortFuture.setSuccess();
}
}

@Override
Expand All @@ -86,6 +90,10 @@ protected void abortInputRequested(
{
channel.engine.abortInput(channel, abortFuture);
}
else
{
abortFuture.setSuccess();
}
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,11 @@ protected void abortOutputRequested(
ZillaChannel channel = (ZillaChannel) evt.getChannel();
ChannelFuture abortFuture = evt.getFuture();

if (!channel.isWriteClosed())
if (channel.isWriteAborted())
{
abortFuture.setSuccess();
}
else if (!channel.isWriteClosed())
{
channel.engine.abortOutput(channel, abortFuture);
}
Expand All @@ -93,7 +97,11 @@ protected void abortInputRequested(
ZillaChannel channel = (ZillaChannel) evt.getChannel();
ChannelFuture abortFuture = evt.getFuture();

if (!channel.isReadClosed())
if (channel.isReadAborted())
{
abortFuture.setSuccess();
}
else if (!channel.isReadClosed())
{
channel.engine.abortInput(channel, abortFuture);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -617,7 +617,11 @@ public void run()
{
try
{
if (!channel.isWriteClosed())
if (channel.isWriteAborted())
{
handlerFuture.setSuccess();
}
else if (!channel.isWriteClosed())
{
ZillaEngine engine = channel.engine;
int scopeIndex = channel.getLocalScope(); // ??
Expand Down Expand Up @@ -651,7 +655,11 @@ public void run()
{
try
{
if (!channel.isReadClosed())
if (channel.isReadAborted())
{
handlerFuture.setSuccess();
}
else if (!channel.isReadClosed())
{
ZillaEngine engine = channel.engine;
int scopeIndex = channel.getLocalScope();
Expand Down
Loading