svn commit: r1414565 - in /camel/branches/camel-2.10.x: ./ camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateTimeoutWithExecutorServiceTest.java

[davsclaus]

Author: davsclaus
Date: Wed Nov 28 07:42:49 2012
New Revision: 1414565

URL: http://svn.apache.org/viewvc?rev=1414565&view=rev
Log:
Fixed potential NPE testing on CI servers on various platforms

Modified:
    camel/branches/camel-2.10.x/   (props changed)
    
camel/branches/camel-2.10.x/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateTimeoutWithExecutorServiceTest.java

Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
  Merged /camel/trunk:r1414564

Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
camel/branches/camel-2.10.x/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateTimeoutWithExecutorServiceTest.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateTimeoutWithExecutorServiceTest.java?rev=1414565&r1=1414564&r2=1414565&view=diff
==============================================================================
--- 
camel/branches/camel-2.10.x/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateTimeoutWithExecutorServiceTest.java
 (original)
+++ 
camel/branches/camel-2.10.x/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateTimeoutWithExecutorServiceTest.java
 Wed Nov 28 07:42:49 2012
@@ -57,7 +57,7 @@ public class AggregateTimeoutWithExecuto
         Thread[] threads = new Thread[threadGroup.activeCount()];
         threadGroup.enumerate(threads);
         for (Thread thread : threads) {
-            if 
(thread.getName().contains(AggregateProcessor.AGGREGATE_TIMEOUT_CHECKER)) {
+            if (thread != null && 
thread.getName().contains(AggregateProcessor.AGGREGATE_TIMEOUT_CHECKER)) {
                 ++count;
             }
         }