Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Avoid potential NPEs seen on tests

This commit is contained in:
jbertram 2015-04-29 13:35:18 -05:00
parent 791cc5c50c
commit 028529b8a9
2 changed files with 37 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
artemis-protocols/artemis-proton-plug/src/test/java/org/proton/plug/test/minimalserver/MinimalServer.java
View File

@ -155,8 +155,15 @@ public class MinimalServer
public synchronized void stop()
{
serverChannelGroup.close().awaitUninterruptibly();
ChannelGroupFuture future = channelGroup.close().awaitUninterruptibly();
if (serverChannelGroup != null)
{
serverChannelGroup.close().awaitUninterruptibly();
}
if (channelGroup != null)
{
ChannelGroupFuture future = channelGroup.close().awaitUninterruptibly();
}
}

46
artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyAcceptor.java
View File

@ -546,19 +546,26 @@ public class NettyAcceptor implements Acceptor
// serverChannelGroup has been unbound in pause()
serverChannelGroup.close().awaitUninterruptibly();
ChannelGroupFuture future = channelGroup.close().awaitUninterruptibly();
if (!future.isSuccess())
if (serverChannelGroup != null)
{
ActiveMQServerLogger.LOGGER.nettyChannelGroupError();
Iterator<Channel> iterator = future.group().iterator();
while (iterator.hasNext())
serverChannelGroup.close().awaitUninterruptibly();
}
if (channelGroup != null)
{
ChannelGroupFuture future = channelGroup.close().awaitUninterruptibly();
if (!future.isSuccess())
{
Channel channel = iterator.next();
if (channel.isActive())
ActiveMQServerLogger.LOGGER.nettyChannelGroupError();
Iterator<Channel> iterator = future.group().iterator();
while (iterator.hasNext())
{
ActiveMQServerLogger.LOGGER.nettyChannelStillOpen(channel, channel.remoteAddress());
Channel channel = iterator.next();
if (channel.isActive())
{
ActiveMQServerLogger.LOGGER.nettyChannelStillOpen(channel, channel.remoteAddress());
}
}
}
}
@ -617,17 +624,20 @@ public class NettyAcceptor implements Acceptor
}
// We *pause* the acceptor so no new connections are made
ChannelGroupFuture future = serverChannelGroup.close().awaitUninterruptibly();
if (!future.isSuccess())
if (serverChannelGroup != null)
{
ActiveMQServerLogger.LOGGER.nettyChannelGroupBindError();
Iterator<Channel> iterator = future.group().iterator();
while (iterator.hasNext())
ChannelGroupFuture future = serverChannelGroup.close().awaitUninterruptibly();
if (!future.isSuccess())
{
Channel channel = iterator.next();
if (channel.isActive())
ActiveMQServerLogger.LOGGER.nettyChannelGroupBindError();
Iterator<Channel> iterator = future.group().iterator();
while (iterator.hasNext())
{
ActiveMQServerLogger.LOGGER.nettyChannelStillBound(channel, channel.remoteAddress());
Channel channel = iterator.next();
if (channel.isActive())
{
ActiveMQServerLogger.LOGGER.nettyChannelStillBound(channel, channel.remoteAddress());
}
}
}
}