rhodes 2.1.0 → 2.2.0.beta.1

data/platform/bb/build/rhodes_build.files

@@ -1,40 +1,44 @@
-platform\bb\rhodes\src\com\rho\file\Jsr75File.java
-platform\bb\rhodes\src\com\rho\file\Jsr75RAFileImpl.java
-platform\bb\rhodes\src\com\rho\rubyext\GeoLocation.java
-platform\bb\rhodes\src\com\rho\rubyext\System.java
-platform\bb\rhodes\src\com\rho\rubyext\XMLParser.java
-platform\bb\rhodes\src\com\rho\rubyext\Alert.java
-platform\bb\rhodes\src\com\rho\net\BaseSocket.java
-platform\bb\rhodes\src\com\rho\net\bb\BBHttpConnection.java
-platform\bb\rhodes\src\com\rho\net\bb\NativeBBHttpConnection.java
-platform\bb\rhodes\src\com\rho\net\NetworkAccess.java
-platform\bb\rhodes\src\com\rho\net\SSLSocket.java
-platform\bb\rhodes\src\com\rho\net\TCPSocket.java
-platform\bb\rhodes\src\com\rho\RhoRubyHelper.java
-platform\bb\rhodes\src\com\rho\Version.java
-platform\bb\rhodes\src\com\rho\BrowserAdapter.java
-platform\bb\rhodes\src\com\rho\IBrowserAdapter.java
-platform\bb\rhodes\src\rhomobile\camera\Camera.java
-platform\bb\rhodes\src\rhomobile\camera\CameraScreen.java
-platform\bb\rhodes\src\rhomobile\camera\CameraFilesListener.java
-platform\bb\rhodes\src\rhomobile\camera\ImageBrowserScreen.java
-platform\bb\rhodes\src\rhomobile\LogOptionsScreen.java
-platform\bb\rhodes\src\rhomobile\LogScreen.java
-platform\bb\rhodes\src\rhomobile\PushListeningThread.java
-platform\bb\rhodes\src\rhomobile\RhodesApplication.java
-platform\bb\rhodes\src\rhomobile\RhoPhonebook.java
-platform\bb\rhodes\src\rhomobile\SecondaryResourceFetchThread.java
-platform\bb\rhodes\src\rhomobile\Utilities.java
-platform\bb\rhodes\src\com\rho\rubyext\WebView.java
-platform\bb\rhodes\src\rhomobile\datetime\DateTimePicker.java
-platform\bb\rhodes\src\rhomobile\datetime\DateTimeScreen.java
-platform\bb\rhodes\src\rhomobile\RingtoneManager.java
-platform\bb\rhodes\src\rhomobile\NativeBar.java
-platform\bb\rhodes\src\rhomobile\mapview\Annotation.java
-platform\bb\rhodes\src\rhomobile\mapview\GoogleMapField.java
-platform\bb\rhodes\src\rhomobile\mapview\GoogleMapProvider.java
-platform\bb\rhodes\src\rhomobile\mapview\MapProvider.java
-platform\bb\rhodes\src\rhomobile\mapview\MapView.java
-platform\bb\rhodes\src\rhomobile\mapview\MapViewParent.java
-platform\bb\rhodes\src\rhomobile\mapview\MapViewScreen.java
-platform\bb\rhodes\src\rhomobile\mapview\RhoMapField.java
+platform/bb/rhodes/src/com/rho/file/Jsr75File.java
+platform/bb/rhodes/src/com/rho/file/Jsr75RAFileImpl.java
+platform/bb/rhodes/src/com/rho/rubyext/GeoLocation.java
+platform/bb/rhodes/src/com/rho/rubyext/System.java
+platform/bb/rhodes/src/com/rho/rubyext/XMLParser.java
+platform/bb/rhodes/src/com/rho/rubyext/Alert.java
+platform/bb/rhodes/src/com/rho/rubyext/RhoPhonebook.java
+platform/bb/rhodes/src/com/rho/rubyext/RhoCalendar.java
+platform/bb/rhodes/src/com/rho/net/BaseSocket.java
+platform/bb/rhodes/src/com/rho/net/bb/BBHttpConnection.java
+platform/bb/rhodes/src/com/rho/net/bb/NativeBBHttpConnection.java
+platform/bb/rhodes/src/com/rho/net/NetworkAccess.java
+platform/bb/rhodes/src/com/rho/net/SSLSocket.java
+platform/bb/rhodes/src/com/rho/net/TCPSocket.java
+platform/bb/rhodes/src/com/rho/RhoRubyHelper.java
+platform/bb/rhodes/src/com/rho/Version.java
+platform/bb/rhodes/src/com/rho/BrowserAdapter.java
+platform/bb/rhodes/src/com/rho/IBrowserAdapter.java
+platform/bb/rhodes/src/rhomobile/bluetooth/BluetoothManager.java
+platform/bb/rhodes/src/rhomobile/bluetooth/BluetoothScreen.java
+platform/bb/rhodes/src/rhomobile/bluetooth/BluetoothPort.java
+platform/bb/rhodes/src/rhomobile/camera/Camera.java
+platform/bb/rhodes/src/rhomobile/camera/CameraScreen.java
+platform/bb/rhodes/src/rhomobile/camera/CameraFilesListener.java
+platform/bb/rhodes/src/rhomobile/camera/ImageBrowserScreen.java
+platform/bb/rhodes/src/rhomobile/LogOptionsScreen.java
+platform/bb/rhodes/src/rhomobile/LogScreen.java
+platform/bb/rhodes/src/rhomobile/PushListeningThread.java
+platform/bb/rhodes/src/rhomobile/RhodesApplication.java
+platform/bb/rhodes/src/rhomobile/SecondaryResourceFetchThread.java
+platform/bb/rhodes/src/rhomobile/Utilities.java
+platform/bb/rhodes/src/com/rho/rubyext/WebView.java
+platform/bb/rhodes/src/rhomobile/datetime/DateTimePicker.java
+platform/bb/rhodes/src/rhomobile/datetime/DateTimeScreen.java
+platform/bb/rhodes/src/rhomobile/RingtoneManager.java
+platform/bb/rhodes/src/rhomobile/NativeBar.java
+platform/bb/rhodes/src/rhomobile/mapview/Annotation.java
+platform/bb/rhodes/src/rhomobile/mapview/GoogleMapField.java
+platform/bb/rhodes/src/rhomobile/mapview/GoogleMapProvider.java
+platform/bb/rhodes/src/rhomobile/mapview/MapProvider.java
+platform/bb/rhodes/src/rhomobile/mapview/MapView.java
+platform/bb/rhodes/src/rhomobile/mapview/MapViewParent.java
+platform/bb/rhodes/src/rhomobile/mapview/MapViewScreen.java
+platform/bb/rhodes/src/rhomobile/mapview/RhoMapField.java

data/platform/bb/rhodes/platform/5.0/com/rho/BrowserAdapter5.java

@@ -7,6 +7,7 @@ import net.rim.device.api.system.Application;
 import javax.microedition.io.HttpConnection;
 import javax.microedition.io.InputConnection;
 
+import com.rho.RhoLogger;
 import com.rho.RhodesApp;
 import com.rho.net.URI;
 
@@ -95,6 +96,7 @@ public class BrowserAdapter5 implements IBrowserAdapter
 	
 	private void createBrowserField()
 	{
+		LOG.INFO("Use BrowserField5");
 		m_oBrowserField = new BrowserField(m_oConfig);
 		m_oBrowserField.getRenderingOptions().setProperty(RenderingOptions.CORE_OPTIONS_GUID, RenderingOptions.ALLOW_POPUPS, true);
 		m_oController = new RhoProtocolController(m_oBrowserField);

data/platform/bb/rhodes/platform/5.0/com/rho/RhodesApplicationPlatform.java

@@ -0,0 +1,237 @@
+package com.rho;
+
+import java.io.InputStream;
+
+import javax.microedition.io.StreamConnection;
+
+import com.rho.RhoClassFactory;
+import com.rho.RhoEmptyLogger;
+import com.rho.RhoLogger;
+import com.rho.RhoThread;
+import com.rho.RhodesApp;
+import com.rho.ThreadQueue;
+import com.rho.ThreadQueue.IQueueCommand;
+import com.rho.net.URI;
+
+import net.rim.blackberry.api.push.*;
+import net.rim.device.api.io.http.PushInputStream;
+import net.rim.device.api.system.ApplicationDescriptor;
+import net.rim.device.api.ui.UiApplication;
+import net.rim.device.api.util.DataBuffer;
+/**
+ *
+ */
+public class RhodesApplicationPlatform extends UiApplication implements PushApplication
+{
+	private static final RhoLogger LOG = RhoLogger.RHO_STRIP_LOG ? new RhoEmptyLogger() : 
+		new RhoLogger("RhodesPUSH");
+	
+	private static final int CHUNK_SIZE = 256;
+	PushMessageThread m_PushMessageThread;
+
+    private static class PushStatusCommand implements IQueueCommand
+    {
+		String m_strStatus; 
+    	
+		public PushStatusCommand(String strStatus) 
+		{
+			m_strStatus = strStatus;
+		}
+		public boolean equals(IQueueCommand cmd){return false;}
+		
+		public void execute()
+		{
+	        try
+	        {
+	        	RhodesApp.getInstance().callPushCallback(m_strStatus);
+	        }catch(Exception exc)
+	        {
+	        	LOG.ERROR("callPushCallback failed.", exc);
+	        }
+		}
+    }
+    
+    private static class PushMessageCommand implements IQueueCommand
+    {
+		PushInputStream m_inputStream; 
+		StreamConnection m_conn;
+    	
+		public PushMessageCommand(PushInputStream inputStream, StreamConnection conn) 
+		{
+			m_inputStream = inputStream;
+			m_conn = conn;
+		}
+		public boolean equals(IQueueCommand cmd){return false;}
+		
+		public void execute()
+		{
+			InputStream input = null;
+
+			try
+			{
+				input = m_conn.openInputStream();
+                DataBuffer db = new DataBuffer();
+                byte[] data = new byte[CHUNK_SIZE];
+                int chunk = 0;
+                
+                while ( -1 != (chunk = input.read(data)) )
+                {
+                    db.write(data, 0, chunk);
+                }
+			
+                data = db.getArray();
+                
+	            try
+	            {
+	            	rhomobile.PushListeningThread.processPushMessage(data, db.getLength());
+	            }catch(Exception exc)
+	            {
+	            	LOG.ERROR("processPushMessage failed.Data: " + new String(data), exc);
+	            }catch(Throwable th)
+	            {
+	            	LOG.ERROR("processPushMessage crashed.Data: " + new String(data), th);
+	            }
+            }catch(Exception exc)
+            {
+            	LOG.ERROR("Read PUSH message failed.", exc);
+            }catch(Throwable th)
+            {
+            	LOG.ERROR("Read PUSH message crashed.", th);
+            }finally
+            {
+            	try
+            	{
+	                m_inputStream.accept();
+	
+	                if ( input != null)
+	                	input.close();
+	                
+	                m_inputStream.close();
+	                m_conn.close();
+            	}catch(Exception exc)
+            	{
+            		
+            	}
+            }
+		}		
+		
+    }
+	
+	private static class PushMessageThread extends ThreadQueue
+	{
+		public PushMessageThread() 
+		{
+			super(new RhoClassFactory());
+			
+	        ThreadQueue.setLogCategory(LOG.getLogCategory());
+
+	        setPollInterval(QUEUE_POLL_INTERVAL_INFINITE);
+	        
+	        start(epLow);
+		}
+	}
+	
+	public void onMessage(PushInputStream inputStream, StreamConnection conn) 
+	{
+		LOG.INFO("onMessage");
+		m_PushMessageThread.addQueueCommand( new PushMessageCommand(inputStream, conn) );
+	}
+
+	public void onStatusChange(PushApplicationStatus status) 
+	{
+        String strError = status.getError();
+
+        String strStatus = "", strRegReason = "";
+
+        switch( status.getStatus() ) 
+        {
+            case PushApplicationStatus.STATUS_ACTIVE:
+            	strStatus = "Active";
+                break;
+            case PushApplicationStatus.STATUS_FAILED:
+            	strStatus = "Failed";
+                break;
+            case PushApplicationStatus.STATUS_NOT_REGISTERED:
+            	strStatus = "Not Registered";
+                break;
+            case PushApplicationStatus.STATUS_PENDING:
+                strStatus = "Pending";
+                break;
+        }
+        
+        switch( status.getReason() ) {
+	        case PushApplicationStatus.REASON_SIM_CHANGE:
+	        	strRegReason = "Status change was initiated by SIM card change";
+	            break;
+	        case PushApplicationStatus.REASON_API_CALL:
+	        	strRegReason = "Status change was initiated by API call";
+	            break;
+	        case PushApplicationStatus.REASON_REJECTED_BY_SERVER:
+	        	strRegReason = "Registration was rejected by server ";
+	        	break;
+	        case PushApplicationStatus.REASON_NETWORK_ERROR:
+	        	strRegReason = "Communication failed due to network error ";
+	        	break;
+	        case PushApplicationStatus.REASON_INVALID_PARAMETERS:
+	        	strRegReason = "Invalid parameters were provided that caused registration failure ";
+	            break;
+        }
+        
+        String strMsg = "status="+URI.urlEncode(strStatus)+"&reason="+URI.urlEncode(strRegReason);
+        
+        if ( strError != null && strError.length() > 0 )
+        	strMsg += "&error="+URI.urlEncode(strError);
+
+		LOG.INFO("onStatusChange : " + strMsg);
+		
+		m_PushMessageThread.addQueueCommand( new PushStatusCommand(strMsg) );
+	}
+	
+	public void onPlatformActivate()
+	{
+		if ( com.rho.Capabilities.ENABLE_PUSH )
+		{
+			if ( !rhomobile.PushListeningThread.isPushServiceEnabled() )
+				return;
+			
+			getUiApplication().invokeLater( new Runnable()
+	        {
+	            public void run()
+	            {
+	
+					m_PushMessageThread = new PushMessageThread();
+					String strAppName = RhoConf.getInstance().getString("push_service_appname");
+					String strUrl = RhoConf.getInstance().getString("push_service_url");
+					int nPort = RhoConf.getInstance().getInt("push_service_port");
+					byte btServiceType = RhoConf.getInstance().getString("push_service_type").equalsIgnoreCase("BPAS") ?
+							PushApplicationDescriptor.SERVER_TYPE_BPAS : PushApplicationDescriptor.SERVER_TYPE_NONE;
+					
+					PushApplicationDescriptor pad = new PushApplicationDescriptor(
+							strAppName, nPort, strUrl, btServiceType, 
+							ApplicationDescriptor.currentApplicationDescriptor());
+					
+					PushApplicationStatus status = PushApplicationRegistry.getStatus(pad);
+			
+					LOG.INFO("registerPushService status : " + status.toString());
+			
+					if (status.getStatus() != PushApplicationStatus.STATUS_ACTIVE && status.getStatus() != PushApplicationStatus.STATUS_PENDING)
+					{
+						
+						LOG.INFO("registerPushService registering push");
+						
+						PushApplicationRegistry.registerApplication(pad);
+					}
+	            }
+	        });
+		}
+	}
+	
+	public void onPlatformClose()
+	{
+		if ( m_PushMessageThread != null )
+			m_PushMessageThread.stop(3);
+		
+		m_PushMessageThread = null;
+	}
+	
+}

data/platform/bb/rhodes/platform/common/com/rho/RhodesApplicationPlatform.java

@@ -0,0 +1,14 @@
+package com.rho;
+
+import net.rim.device.api.ui.UiApplication;
+
+public class RhodesApplicationPlatform extends UiApplication
+{
+	public void onPlatformActivate()
+	{
+	}
+	
+	public void onPlatformClose()
+	{
+	}
+}

data/platform/bb/rhodes/rhodes.jdp

@@ -45,7 +45,13 @@ src\com\rho\rubyext\GeoLocation.java
 src\com\rho\rubyext\System.java
 src\com\rho\rubyext\WebView.java
 src\com\rho\rubyext\XMLParser.java
+src\com\rho\rubyext\RhoPhonebook.java
+src\com\rho\rubyext\RhoCalendar.java
 src\com\rho\Version.java
+src\com\rho\RhodesApplicationPlatform.java
+src\rhomobile\bluetooth\BluetoothManager.java
+src\rhomobile\bluetooth\BluetoothScreen.java
+src\rhomobile\bluetooth\BluetoothPort.java
 src\rhomobile\camera\Camera.java
 src\rhomobile\camera\CameraFilesListener.java
 src\rhomobile\camera\CameraScreen.java
@@ -65,7 +71,6 @@ src\rhomobile\mapview\RhoMapField.java
 src\rhomobile\NativeBar.java
 src\rhomobile\PushListeningThread.java
 src\rhomobile\RhodesApplication.java
-src\rhomobile\RhoPhonebook.java
 src\rhomobile\RingtoneManager.java
 src\rhomobile\SecondaryResourceFetchThread.java
 src\rhomobile\Utilities.java

data/platform/bb/rhodes/src/com/rho/RhoRubyHelper.java

@@ -8,10 +8,13 @@ import net.rim.device.api.system.DeviceInfo;
 import net.rim.device.api.io.http.HttpHeaders;
 import com.rho.rubyext.Alert;
 import rhomobile.NativeBar;
-import rhomobile.RhoPhonebook;
+import com.rho.rubyext.RhoPhonebook;
+import com.rho.rubyext.RhoCalendar;
 import rhomobile.RhodesApplication;
 import rhomobile.RingtoneManager;
 import com.rho.rubyext.WebView;
+
+import rhomobile.bluetooth.BluetoothManager;
 import rhomobile.camera.Camera;
 import rhomobile.datetime.DateTimePicker;
 import rhomobile.mapview.MapView;
@@ -38,7 +41,10 @@ public class RhoRubyHelper implements IRhoRubyHelper {
 	  
 	public void initRubyExtensions(){
         RhoPhonebook.initMethods(RubyRuntime.PhonebookClass);
+        RhoCalendar.initConstants(RubyRuntime.EventModule);
+        RhoCalendar.initMethods(RubyRuntime.CalendarClass);
         Camera.initMethods(RubyRuntime.CameraClass);
+        BluetoothManager.initMethods(RubyRuntime.RhoBluetoothClass);
         WebView.initMethods(RubyRuntime.WebViewClass);
         RhoConf.initMethods(RubyRuntime.RhoConfClass);
         Alert.initMethods(RubyRuntime.AlertClass);        

data/platform/bb/rhodes/src/com/rho/RhodesApplicationPlatform.java

@@ -0,0 +1,14 @@
+package com.rho;
+
+import net.rim.device.api.ui.UiApplication;
+
+public class RhodesApplicationPlatform extends UiApplication
+{
+	public void onPlatformActivate()
+	{
+	}
+	
+	public void onPlatformClose()
+	{
+	}
+}

data/platform/bb/rhodes/src/com/rho/net/NetworkAccess.java

@@ -24,7 +24,7 @@ public class NetworkAccess implements INetworkAccess {
 		new RhoLogger("NetworkAccess");
 
 	private static String URLsuffix = "";
-	private static String WIFIsuffix;
+	private static String WIFIsuffix = "";
 	private static boolean networkConfigured = false;
 	private static boolean bes = true;
 	private static long  m_nMaxPacketSize = 0;
@@ -33,22 +33,20 @@ public class NetworkAccess implements INetworkAccess {
 	{
 		networkConfigured = false;
 		bes = false;
-		URLsuffix = null;
-
+		URLsuffix = "";
+		WIFIsuffix = "";
+		
 		String strDeviceside = ";deviceside=true";
 		if ( com.rho.RhoConf.getInstance().getInt("no_deviceside_postfix") == 1 )
 			strDeviceside = "";
 
-		if (DeviceInfo.isSimulator()) {
-			if (com.rho.RhoConf.getInstance().getInt("no_deviceside_postfix") == 1) {
-				URLsuffix = "";
-				WIFIsuffix = ";interface=wifi";
-			} else {
-				URLsuffix = ";deviceside=true";
-				WIFIsuffix = ";interface=wifi;deviceside=true";
-			}
+		if (DeviceInfo.isSimulator()) 
+		{
+			URLsuffix = strDeviceside;
+			WIFIsuffix = ";interface=wifi";
 			networkConfigured = true;
-		}else{
+		}else
+		{
 			ServiceBook sb = ServiceBook.getSB();
 			if (sb != null) {
 				ServiceRecord[] wifis = sb.findRecordsByCid("WPTCP");
@@ -56,7 +54,7 @@ public class NetworkAccess implements INetworkAccess {
 					if (/*srs[i].isDisabled() ||*/ !wifis[i].isValid())
 						continue;
 					
-					WIFIsuffix = ";interface=wifi" + strDeviceside; 
+					WIFIsuffix = ";interface=wifi";// + strDeviceside; 
 						//";deviceside=true;ConnectionUID=" + 
 						//wifis[i].getUid();
 					
@@ -114,7 +112,7 @@ public class NetworkAccess implements INetworkAccess {
 			networkConfigured = true;
 		}
 
-		LOG.INFO("Postfix: " + URLsuffix);
+		LOG.INFO("Postfix: " + URLsuffix + ";Wifi: " + WIFIsuffix);
 	}
 
 	/*public IHttpConnection doLocalRequest(String strUrl, String strBody)
@@ -183,75 +181,63 @@ public class NetworkAccess implements INetworkAccess {
 		return (SocketConnection)baseConnect(strUrl, ignoreSuffix);
 	}
 	
+	private Connection doConnect(String urlArg, boolean bThrowIOException) throws IOException
+	{
+		Connection conn = null;		
+		try 
+		{
+			String url = new String(urlArg);
+            if (url.startsWith("https"))
+				url += ";EndToEndDesired;RdHTTPS";
+			
+			LOG.INFO("Connect to url: " + url);
+            conn = Connector.open(url, Connector.READ_WRITE, true);
+		} catch (java.io.InterruptedIOException ioe) 
+		{
+			LOG.ERROR("Connector.open InterruptedIOException", ioe );
+			if (conn != null)
+				conn.close();
+			conn = null;
+			throw ioe;			
+		} catch (IOException ioe) 
+		{
+			LOG.ERROR("Connector.open exception", ioe );
+			
+            String strMsg = ioe.getMessage(); 
+			boolean bTimeout = strMsg != null && (strMsg.indexOf("timed out") >= 0 || strMsg.indexOf("Timed out") >= 0);
+			
+			if ( bTimeout || bThrowIOException )				
+			{				
+				if (conn != null)
+					conn.close();
+				conn = null;
+				throw ioe;
+			}
+		}catch(Exception exc)
+		{
+			throw new IOException("Could not open network connection.");
+		}
+		
+		return conn;
+	}
+	
 	public Connection baseConnect(String strUrl, boolean ignoreSuffix) throws IOException 
 	{
 		Connection conn = null;
 		
 		//Try wifi first
-		if ( WIFIsuffix != null && isWifiActive() ){
-			try {
-				LOG.INFO(strUrl + WIFIsuffix);
-				conn = Connector.open(strUrl + WIFIsuffix);
-			} catch (IOException ioe) {
-				LOG.INFO("WIFI connection failed: " + ioe.getMessage() );
-			}
+		if ( WIFIsuffix != null && isWifiActive() )
+		{
+			conn = doConnect(strUrl + WIFIsuffix + URLsuffix, false);
+			if ( conn == null )
+				conn = doConnect(strUrl + WIFIsuffix, false);				
 		}
 		
-		if ( conn == null ){
-			/*int nStatus = net.rim.device.api.system.RadioInfo.getNetworkService();
-			if ( ( nStatus & net.rim.device.api.system.RadioInfo.NETWORK_SERVICE_DATA) == 0) {
-				throw new IOException("Network Data Service Not Available");
-			}*/
-			
-			try {
-				String url = strUrl;
-				//if ( RhoConf.getInstance().getBool("bb_sim_use_deviceside") || !ignoreSuffix )
-					url += URLsuffix;
-                if (url.startsWith("https"))
-					url += ";EndToEndDesired;RdHTTPS";
-					
-				LOG.INFO(url);
-                conn = Connector.open(url, Connector.READ_WRITE, true);
-			} catch (java.io.InterruptedIOException ioe) {
-				LOG.ERROR("Connector.open InterruptedIOException", ioe );
-				if (conn != null)
-					conn.close();
-				conn = null;
-				throw ioe;			
-			} catch (IOException ioe) {
-                String strMsg = ioe.getMessage(); 
-				
-		    	boolean bTimeout = strMsg != null && (strMsg.indexOf("timed out") >= 0 || strMsg.indexOf("Timed out") >= 0);
-				
-				if ( !bTimeout && URLsuffix.length() > 0 )				{
-					LOG.ERROR("Connector.open exception", ioe );
-					
-					try{
-                        String url = strUrl;
-						if (url.startsWith("https"))
-							url += ";EndToEndDesired;RdHTTPS";
-						
-						LOG.INFO(url);
-						conn = Connector.open(url, Connector.READ_WRITE, true);					
-					} catch (IOException ioe2) {
-						LOG.ERROR("Connector.open exception", ioe2 );
-						if (conn != null)
-							conn.close();
-						conn = null;
-						throw ioe2;
-					}
-				}else
-				{				
-					LOG.ERROR("Connector.open exception", ioe );
-					if (conn != null)
-						conn.close();
-					conn = null;
-					throw ioe;
-				}
-			}catch(Exception exc)
-			{
-				throw new IOException("Could not open network connection.");
-			}
+		if ( conn == null )
+		{
+			conn = doConnect(strUrl + URLsuffix, false);
+			if ( conn == null )
+				conn = doConnect(strUrl, true);				
 		}
 		
 		return conn;