servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ksobkow...@apache.org
Subject servicemix git commit: SM-2851: Some itests fail accidentally with NPE
Date Tue, 02 Feb 2016 23:36:44 GMT
Repository: servicemix
Updated Branches:
  refs/heads/servicemix-6.x 9e47cbc8a -> a97b65950


SM-2851: Some itests fail accidentally with NPE


Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/a97b6595
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/a97b6595
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/a97b6595

Branch: refs/heads/servicemix-6.x
Commit: a97b6595023b93a6ec7808561f58538211398866
Parents: 9e47cbc
Author: Krzysztof Sobkowiak <krzys.sobkowiak@gmail.com>
Authored: Wed Feb 3 00:34:33 2016 +0100
Committer: Krzysztof Sobkowiak <krzys.sobkowiak@gmail.com>
Committed: Wed Feb 3 00:36:14 2016 +0100

----------------------------------------------------------------------
 .../org/apache/servicemix/itests/IntegrationTestSupport.scala      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/servicemix/blob/a97b6595/itests/src/test/scala/org/apache/servicemix/itests/IntegrationTestSupport.scala
----------------------------------------------------------------------
diff --git a/itests/src/test/scala/org/apache/servicemix/itests/IntegrationTestSupport.scala
b/itests/src/test/scala/org/apache/servicemix/itests/IntegrationTestSupport.scala
index 2f6f19d..1500bc3 100644
--- a/itests/src/test/scala/org/apache/servicemix/itests/IntegrationTestSupport.scala
+++ b/itests/src/test/scala/org/apache/servicemix/itests/IntegrationTestSupport.scala
@@ -112,7 +112,7 @@ abstract class IntegrationTestSupport extends Await with IntegrationTestConfigur
 
     def clear = buffer.clear
 
-    def containsMessage(predicate: String => Boolean) : Option[String] = containsEvent(event
=> predicate(event.getMessage)) map ( _.getMessage )
+    def containsMessage(predicate: String => Boolean) : Option[String] = containsEvent(event
=> if(event != null) predicate(event.getMessage) else false) map ( _.getMessage )
 
     def containsEvent(predicate: PaxLoggingEvent => Boolean) : Option[PaxLoggingEvent]
= buffer find (predicate)
 


Mime
View raw message