--- a/debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/service/ConnectedServiceFactory.java	Mon Feb 01 12:38:42 2010 -0600
+++ b/debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/service/ConnectedServiceFactory.java	Mon Feb 01 13:27:18 2010 -0600
@@ -20,6 +20,7 @@
 
 import com.nokia.carbide.remoteconnections.interfaces.*;
 import com.nokia.carbide.trk.support.connection.*;
+import com.nokia.cpp.internal.api.utils.core.HostOS;
 
 import java.util.*;
 
@@ -34,10 +35,14 @@
 	public IConnectedService createConnectedService(IService service, IConnection connection) {
 		if (service instanceof TracingService &&
 				isCompatibleConnection(getCompatibleTracingConnectionTypeIds(), connection)) {
+			if (HostOS.IS_UNIX)
+				return new RemoteConnectedService(service);		// TODO: not ported
 			return new TracingConnectedService(service, (AbstractSynchronizedConnection) connection);
 		}
 		else if (service instanceof TRKService &&
 				isCompatibleConnection(getCompatibleTRKConnectionTypeIds(), connection)) {
+			if (HostOS.IS_UNIX)
+				return new RemoteConnectedService(service);	// TODO: not ported
 			return new TRKConnectedService(service, (AbstractSynchronizedConnection) connection);
 		}
 		
@@ -75,7 +80,7 @@
 			return getCompatibleTRKConnectionTypeIds();
 		else if (service instanceof TracingService)
 			return getCompatibleTracingConnectionTypeIds();
-		return Collections.EMPTY_LIST;
+		return Collections.emptyList();
 	}
 
 }