Permalink
Browse files

Merge remote branch 'origin/master'

  • Loading branch information...
2 parents 899267c + db97d53 commit 04ac7b89756d0f77859a9878566a2158d1f2b856 @eevans eevans committed Dec 20, 2010
Showing with 4 additions and 2 deletions.
  1. +4 −2 src/com/rackspace/flewton/CollectorHandler.java
@@ -69,6 +69,7 @@ public void messageReceived(ChannelHandlerContext ctx, MessageEvent e) {
break;
default:
if (logUnhandledVersions) {
+ // this means the record stays null. we need to check for that when handling.
logger.warn(String.format("Netflow v%d is not supported", version));
if (logger.isDebugEnabled())
logPacket(e.getRemoteAddress(), buff.duplicate());
@@ -82,8 +83,9 @@ public void messageReceived(ChannelHandlerContext ctx, MessageEvent e) {
}
// Send record to backends
- for (AbstractBackend backend : backEnds)
- backend.write(record);
+ if (record != null)
+ for (AbstractBackend backend : backEnds)
+ backend.write(record);
}
// dumps the contents of a buffer

0 comments on commit 04ac7b8

Please sign in to comment.