Index: source/ariba/utility/misc/Demultiplexer.hpp
===================================================================
--- source/ariba/utility/misc/Demultiplexer.hpp	(revision 10700)
+++ source/ariba/utility/misc/Demultiplexer.hpp	(revision 12060)
@@ -136,5 +136,5 @@
 
 		SERVICE_LISTENER_MAP_CITERATOR it = mapServiceListener.find( id );
-		if( it == mapServiceListener.end() ) 	return NULL;
+		if( it == mapServiceListener.end() ) 	return 0;
 		else					return it->second;
 	}