Fixes a failure to close a Socket instance.

Makes sure that Socket instances which are discarded because
they are only added after the corresponding ICE Agent has
moved away from the WAITING or RUNNING state are closed. This
prevents a file descriptor leak, since Socket instances which are
not closed (even after they are garbage collected) leave behind
sockets in state CLOSE_WAIT.
This commit is contained in:
Boris Grozev 2016-05-20 11:38:22 -05:00
parent e4f5534b3d
commit 568ace382b

View File

@ -1226,10 +1226,8 @@ public class TcpHarvester
if (!IceProcessingState.WAITING.equals(state)
&& !IceProcessingState.RUNNING.equals(state))
{
logger.info(
"Not adding a socket to an ICE agent with state "
+ state);
return;
throw new IllegalStateException(
"The associated Agent is in state " + state);
}
// Socket to add to the candidate
@ -1433,19 +1431,11 @@ public class TcpHarvester
}
}
}
catch (IOException ioe)
catch (IOException | StunException | IllegalStateException e)
{
logger.info(
"Failed to handle TCP socket "
+ channel.channel.socket() + ": " + ioe);
key.cancel();
closeNoExceptions(channel.channel);
}
catch (StunException se)
{
logger.info(
"Failed to handle TCP socket "
+ channel.channel.socket() + ": " + se);
+ channel.channel.socket() + ": " + e.getMessage());
key.cancel();
closeNoExceptions(channel.channel);
}