# HG changeset patch
# User timkelly
# Date 1250112797 18000
# Node ID e0f29d5da67a2a29d65d317b88233350d9fa9341
# Parent  147ef5f224c467358843fe4923ac14ccb121029b# Parent  ddde4cae03beef3e4baf39f1fc0467ce25fb5c74
merge commit

diff -r 147ef5f224c4 -r e0f29d5da67a connectivity/com.nokia.carbide.remoteConnections.tests/src/com/nokia/carbide/remoteconnections/tests/AllTests.java
--- a/connectivity/com.nokia.carbide.remoteConnections.tests/src/com/nokia/carbide/remoteconnections/tests/AllTests.java	Wed Aug 12 16:32:36 2009 -0500
+++ b/connectivity/com.nokia.carbide.remoteConnections.tests/src/com/nokia/carbide/remoteconnections/tests/AllTests.java	Wed Aug 12 16:33:17 2009 -0500
@@ -27,7 +27,6 @@
 		//$JUnit-BEGIN$
 		suite.addTestSuite(RegistryTest.class);
 		suite.addTestSuite(SerializationTest.class);
-		suite.addTestSuite(ServiceTest.class);
 		suite.addTestSuite(FilterTest.class);
 		suite.addTestSuite(TCPIPConnectionTypeTests.class);
 		//$JUnit-END$
diff -r 147ef5f224c4 -r e0f29d5da67a connectivity/com.nokia.carbide.remoteConnections.tests/src/com/nokia/carbide/remoteconnections/tests/RegistryTest.java
--- a/connectivity/com.nokia.carbide.remoteConnections.tests/src/com/nokia/carbide/remoteconnections/tests/RegistryTest.java	Wed Aug 12 16:32:36 2009 -0500
+++ b/connectivity/com.nokia.carbide.remoteConnections.tests/src/com/nokia/carbide/remoteconnections/tests/RegistryTest.java	Wed Aug 12 16:33:17 2009 -0500
@@ -62,8 +62,7 @@
 		assertEquals(RandomCycleService.class.getName(), service.getIdentifier());
 		
 		Collection<String> ctids = Registry.instance().getCompatibleConnectionTypeIds(service);
-		String id = ctids.iterator().next();
-		assertEquals(ct.getIdentifier(), id);
+		assertTrue(ctids.contains(ct.getIdentifier()));
 	}
 	
 	public void testStoreAndLoadConnections() {
diff -r 147ef5f224c4 -r e0f29d5da67a connectivity/com.nokia.tcf/native/TCFNative/TCFCommSerial/RealSerialComm.cpp
--- a/connectivity/com.nokia.tcf/native/TCFNative/TCFCommSerial/RealSerialComm.cpp	Wed Aug 12 16:32:36 2009 -0500
+++ b/connectivity/com.nokia.tcf/native/TCFNative/TCFCommSerial/RealSerialComm.cpp	Wed Aug 12 16:33:17 2009 -0500
@@ -491,7 +491,7 @@
 			COMMLOGOPEN();
 			COMMLOGS("CRealSerialComm::SendDataToPort WriteFile successful\n");
 			BYTE* ptr = (BYTE*)inData;
-			long numBytes = (inSize > 20) ? 20 : inSize;
+			long numBytes = (inSize > 80) ? 80 : inSize;
 			char msg[200];
 			sprintf(msg, "CRealSerialComm::SendDataToPort = ");
 			for (int i = 0; i < numBytes; i++)
@@ -778,7 +778,12 @@
 				}
 				else
 				{
-					done = true;
+					numberProcessed++;
+					usedLen += fullMessageLength;
+					bytesRemaining -= fullMessageLength;
+					ptr += fullMessageLength;
+					if (bytesRemaining < protocolHeaderLength)
+						done = true;
 				}
 			}
 			DeleteMsg(usedLen);
diff -r 147ef5f224c4 -r e0f29d5da67a connectivity/com.nokia.tcf/native/TCFNative/TCFCommTCP/TcpComm.cpp
--- a/connectivity/com.nokia.tcf/native/TCFNative/TCFCommTCP/TcpComm.cpp	Wed Aug 12 16:32:36 2009 -0500
+++ b/connectivity/com.nokia.tcf/native/TCFNative/TCFCommTCP/TcpComm.cpp	Wed Aug 12 16:33:17 2009 -0500
@@ -533,7 +533,12 @@
 				}
 				else
 				{
-					done = true;
+					numberProcessed++;
+					usedLen += fullMessageLength;
+					bytesRemaining -= fullMessageLength;
+					ptr += fullMessageLength;
+					if (bytesRemaining < protocolHeaderLength)
+						done = true;
 				}
 			}
 			DeleteMsg(usedLen);
diff -r 147ef5f224c4 -r e0f29d5da67a connectivity/com.nokia.tcf/src/com/nokia/tcf/impl/TCMessageInputStream.java
--- a/connectivity/com.nokia.tcf/src/com/nokia/tcf/impl/TCMessageInputStream.java	Wed Aug 12 16:32:36 2009 -0500
+++ b/connectivity/com.nokia.tcf/src/com/nokia/tcf/impl/TCMessageInputStream.java	Wed Aug 12 16:33:17 2009 -0500
@@ -291,7 +291,7 @@
 			e.fillInStackTrace();
 			throw e;
 		}
-		inNumberMessages = 0; // 0 --> get all that fit in MAX_BYTES
+//		inNumberMessages = 0; // 0 --> get all that fit in MAX_BYTES
 		byte[] messageData = new byte[(int) MAX_BYTES];
 		long[] outNumberMessagesRead = new long[1];
 		outNumberMessagesRead[0] = 0;
diff -r 147ef5f224c4 -r e0f29d5da67a core/com.nokia.carbide.cpp/plugin.properties
--- a/core/com.nokia.carbide.cpp/plugin.properties	Wed Aug 12 16:32:36 2009 -0500
+++ b/core/com.nokia.carbide.cpp/plugin.properties	Wed Aug 12 16:33:17 2009 -0500
@@ -1,19 +1,19 @@
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# Plugin properties for Carbide
-# This file should be translated.
-
-
-CHEAT_SHEETS = Cheat Sheets
-CHEAT_SHEETS_MENU = &Cheat Sheets...
-
-productBlurb=\nCarbide.c++ Version 2.2.0\n\
-Build {0} {1}\n\n\n\n\n\n\n\
-Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved.\n\
-Visit http://www.forum.nokia.com/\n\
-This product includes software developed by Eclipse Project.\n\
-Visit http://www.eclipse.org/
-
-theme.name.carbide = Carbide
-
-carbcPreference.common=carbide symbian cpp cplusplus
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# Plugin properties for Carbide
+# This file should be translated.
+
+
+CHEAT_SHEETS = Cheat Sheets
+CHEAT_SHEETS_MENU = &Cheat Sheets...
+
+productBlurb=\nCarbide.c++ Version 2.2.0\n\
+Build {0} {1}\n\n\n\n\n\n\n\
+Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved.\n\
+Visit http://developer.symbian.org/\n\
+This product includes software developed by Eclipse Project.\n\
+Visit http://www.eclipse.org/
+
+theme.name.carbide = Carbide
+
+carbcPreference.common=carbide symbian cpp cplusplus
 carbcPreference.diagnostics=diagnostic logs
\ No newline at end of file