# HG changeset patch
# User Ed Swartz <ed.swartz@nokia.com>
# Date 1277853178 18000
# Node ID e855462d0c8d80c07b356a0eaa76484a826c5954
# Parent  2b3cd56e10904d09b02128b0810882e78d865fbc# Parent  c030090b5e2a742d90947da21a091a8e1a4830dc
Merge commit

diff -r c030090b5e2a -r e855462d0c8d connectivity/com.nokia.tcf/src/com/nokia/tcf/impl/TCAPIConnection.java
--- a/connectivity/com.nokia.tcf/src/com/nokia/tcf/impl/TCAPIConnection.java	Tue Jun 29 15:23:12 2010 -0500
+++ b/connectivity/com.nokia.tcf/src/com/nokia/tcf/impl/TCAPIConnection.java	Tue Jun 29 18:12:58 2010 -0500
@@ -501,9 +501,13 @@
 				settings = new String[1];
 			} else {
 				// Add other connections here
+				return new Status(Status.ERROR, Activator.PLUGIN_ID, (int)TCErrorConstants.TCAPI_ERR_MEDIA_NOT_SUPPORTED, 
+						"Unknown connection type: " + type, null); 
 			}
+			return finishConnect(type, settings, inConnection, inMessageOptions, inMessageIds);
+		} else {
+			return status;
 		}
-		return finishConnect(type, settings, inConnection, inMessageOptions, inMessageIds);
 	}
 	protected void ensureWritableFile(String filePath) throws IOException {
 		// ensure file path points to a writable regular file