Merge commit
authorEd Swartz <ed.swartz@nokia.com>
Wed, 09 Dec 2009 15:44:24 -0600
changeset 667 0d624765b49c
parent 666 4817219999f0 (current diff)
parent 662 de059f9c85e6 (diff)
child 668 633bb201cd8d
child 672 d1a48eefce6b
Merge commit
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);
--- 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);