# HG changeset patch
# User Ed Swartz <ed.swartz@nokia.com>
# Date 1260395064 21600
# Node ID 0d624765b49ce1579edd51bd1a3211db8ef58e40
# Parent  4817219999f081d512b556d786f22fc9deb050f7# Parent  de059f9c85e64c4154fa805d943790a4b161dc3a
Merge commit

diff -r 4817219999f0 -r 0d624765b49c debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/service/TRKConnectedService.java
--- a/debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/service/TRKConnectedService.java	Wed Dec 09 15:43:55 2009 -0600
+++ b/debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/service/TRKConnectedService.java	Wed Dec 09 15:44:24 2009 -0600
@@ -72,6 +72,7 @@
 	
 	private Pair<String, Version> deviceOS;
 	private TRKService trkService;
+	static Class<?> startTCFServer = TCFClassFactory.class; // force the tcf plugin to load
 
 	public TRKConnectedService(IService service, AbstractSynchronizedConnection connection) {
 		super(service, connection);
diff -r 4817219999f0 -r 0d624765b49c debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/service/TracingConnectedService.java
--- a/debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/service/TracingConnectedService.java	Wed Dec 09 15:43:55 2009 -0600
+++ b/debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/service/TracingConnectedService.java	Wed Dec 09 15:44:24 2009 -0600
@@ -46,6 +46,7 @@
 	
 	private static final byte[] TC_REQ_OST = {0x0, 0x0, 0x0, 0x3, 0x0, 0x0, 0x1};
 	private static final byte[] TC_RESP_OST = {0x0, 0x0, 0x0, 0x5, 0x0, 0x1, 0x0, 0x0, 0x1};
+	static Class<?> startTCFServer = TCFClassFactory.class; // force the tcf plugin to load
 
 	public interface IMessageValidator {
 		boolean isValidMessage(byte[] message);