connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/interfaces/AbstractPackageInstallerProvider.java
changeset 1965 0dd7f79ee65d
parent 1627 769102b0e024
--- a/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/interfaces/AbstractPackageInstallerProvider.java	Wed Sep 08 17:11:16 2010 -0500
+++ b/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/interfaces/AbstractPackageInstallerProvider.java	Wed Sep 08 17:12:10 2010 -0500
@@ -19,6 +19,7 @@
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.lang.reflect.InvocationTargetException;
+import java.net.URL;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
@@ -117,7 +118,7 @@
 				installFileUrl = getInstallFileUrl(runnableContext);
 				inputStream = getInstallFile(installFileUrl, runnableContext);
 			} catch (Exception e) {
-				RemoteConnectionsActivator.logError(e);
+				RemoteConnectionsActivator.log("Failed to find package URL " + installFileUrl, e);
 			}
 			String defaultFileName = null;
 			if (installFileUrl != null)
@@ -125,7 +126,16 @@
 			return new PackageContents(defaultFileName, inputStream);
 		}
 		
-		private ByteArrayInputStream getInstallFile(String installFileUrl, IRunnableContext runnableContext) throws Exception {
+		private InputStream getInstallFile(String installFileUrl, IRunnableContext runnableContext) throws Exception {
+			
+			URL url = null;
+			
+			// see if the file is local (Ed's hack for testing...)
+			url = new URL(installFileUrl);
+			if (url.getProtocol().equals("file")) { 
+				return url.openStream();
+			}
+			
 			GetMethod getMethod = new GetMethod(installFileUrl);
 			HttpClient client = new HttpClient();
 			InstallPackages.setProxyData(client, getMethod);