Index: source/ariba/utility/system/Timer.cpp
===================================================================
--- source/ariba/utility/system/Timer.cpp	(revision 3071)
+++ source/ariba/utility/system/Timer.cpp	(revision 3578)
@@ -102,11 +102,14 @@
 	}
 
-	obj->running = false;
+	if(! obj->oneshot )
+		obj->running = false;
 }
 #endif // UNDERLAY_OMNET
 
 void Timer::handleSystemEvent( const SystemEvent& event ) {
-	if( running )
+	if( running ){
+		if( oneshot ) running = false;
 		eventFunction();
+	}
 
 #ifdef UNDERLAY_OMNET