--- a/kernel/eka/euser/us_exec.cpp	Mon Sep 13 15:16:07 2010 +0100
+++ b/kernel/eka/euser/us_exec.cpp	Wed Sep 22 10:53:45 2010 +0100
@@ -4596,6 +4596,10 @@
 @return The Id of this thread.
 */
 	{
+#ifdef __USERSIDE_THREAD_DATA__
+	if(iHandle==KCurrentThreadHandle)
+		return TThreadId( LocalThreadData()->iThreadId );
+#endif // __USERSIDE_THREAD_DATA__
 
 	return TThreadId( (TUint)Exec::ThreadId(iHandle) );
 	}