svn commit: r902758 - /servicemix/smx4/nmr/trunk/nmr/core/src/test/java/org/apache/servicemix/nmr/core/ChannelImplTest.java

[gertv]

Author: gertv
Date: Mon Jan 25 09:58:23 2010
New Revision: 902758

URL: http://svn.apache.org/viewvc?rev=902758&view=rev
Log:
SMX4NMR-177: ChannelImplTest intermittently fails on AIX

Modified:
    
servicemix/smx4/nmr/trunk/nmr/core/src/test/java/org/apache/servicemix/nmr/core/ChannelImplTest.java

Modified: 
servicemix/smx4/nmr/trunk/nmr/core/src/test/java/org/apache/servicemix/nmr/core/ChannelImplTest.java
URL: 
http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/nmr/core/src/test/java/org/apache/servicemix/nmr/core/ChannelImplTest.java?rev=902758&r1=902757&r2=902758&view=diff
==============================================================================
--- 
servicemix/smx4/nmr/trunk/nmr/core/src/test/java/org/apache/servicemix/nmr/core/ChannelImplTest.java
 (original)
+++ 
servicemix/smx4/nmr/trunk/nmr/core/src/test/java/org/apache/servicemix/nmr/core/ChannelImplTest.java
 Mon Jan 25 09:58:23 2010
@@ -225,7 +225,9 @@
         ThreadInfo[]  threadInfos = 
threads.getThreadInfo(threads.getAllThreadIds(), 0);
 
         for (ThreadInfo threadInfo : threadInfos) {
-            if (threadInfo.getThreadName().contains(id)) {
+            if (threadInfo != null &&
+                    threadInfo.getThreadName() != null &&
+                    threadInfo.getThreadName().contains(id)) {
                 return threadInfo;
             }
         }