rhodes 3.0.2 → 3.1.0.beta.1

data/platform/bb/RubyVM/src/com/rho/file/FileAccessBB.java

@@ -1,3 +1,29 @@
+/*------------------------------------------------------------------------
+* (The MIT License)
+* 
+* Copyright (c) 2008-2011 Rhomobile, Inc.
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+* 
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+* 
+* http://rhomobile.com
+*------------------------------------------------------------------------*/
+
 package com.rho.file;
 
 import java.io.IOException;

data/platform/bb/RubyVM/src/com/rho/file/IFile.java

@@ -1,3 +1,29 @@
+/*------------------------------------------------------------------------
+* (The MIT License)
+* 
+* Copyright (c) 2008-2011 Rhomobile, Inc.
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+* 
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+* 
+* http://rhomobile.com
+*------------------------------------------------------------------------*/
+
 package com.rho.file;
 
 import java.io.IOException;

data/platform/bb/RubyVM/src/com/rho/file/IFileAccess.java

@@ -1,3 +1,29 @@
+/*------------------------------------------------------------------------
+* (The MIT License)
+* 
+* Copyright (c) 2008-2011 Rhomobile, Inc.
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+* 
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+* 
+* http://rhomobile.com
+*------------------------------------------------------------------------*/
+
 package com.rho.file;
 
 public interface IFileAccess {

data/platform/bb/RubyVM/src/com/rho/file/IRAFile.java

@@ -1,3 +1,29 @@
+/*------------------------------------------------------------------------
+* (The MIT License)
+* 
+* Copyright (c) 2008-2011 Rhomobile, Inc.
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+* 
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+* 
+* http://rhomobile.com
+*------------------------------------------------------------------------*/
+
 package com.rho.file;
 
 import java.io.IOException;

data/platform/bb/RubyVM/src/com/rho/file/RandomAccessFile.java

@@ -1,3 +1,29 @@
+/*------------------------------------------------------------------------
+* (The MIT License)
+* 
+* Copyright (c) 2008-2011 Rhomobile, Inc.
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+* 
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+* 
+* http://rhomobile.com
+*------------------------------------------------------------------------*/
+
 package com.rho.file;
 
 import java.io.*;

data/platform/bb/RubyVM/src/com/rho/file/RhoFile.java

@@ -1,3 +1,29 @@
+/*------------------------------------------------------------------------
+* (The MIT License)
+* 
+* Copyright (c) 2008-2011 Rhomobile, Inc.
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+* 
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+* 
+* http://rhomobile.com
+*------------------------------------------------------------------------*/
+
 package com.rho.file;
 
 import com.rho.*;

data/platform/bb/RubyVM/src/com/rho/file/SimpleFile.java

@@ -1,3 +1,29 @@
+/*------------------------------------------------------------------------
+* (The MIT License)
+* 
+* Copyright (c) 2008-2011 Rhomobile, Inc.
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+* 
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+* 
+* http://rhomobile.com
+*------------------------------------------------------------------------*/
+
 package com.rho.file;
 
 import java.io.IOException;

data/platform/bb/RubyVM/src/com/rho/net/AsyncHttp.java

@@ -1,3 +1,29 @@
+/*------------------------------------------------------------------------
+* (The MIT License)
+* 
+* Copyright (c) 2008-2011 Rhomobile, Inc.
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+* 
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+* 
+* http://rhomobile.com
+*------------------------------------------------------------------------*/
+
 package com.rho.net;
 
 import com.rho.*;

data/platform/bb/RubyVM/src/com/rho/net/IHttpConnection.java

@@ -1,3 +1,29 @@
+/*------------------------------------------------------------------------
+* (The MIT License)
+* 
+* Copyright (c) 2008-2011 Rhomobile, Inc.
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+* 
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+* 
+* http://rhomobile.com
+*------------------------------------------------------------------------*/
+
 package com.rho.net;
 
 import java.io.DataInputStream;

data/platform/bb/RubyVM/src/com/rho/net/NetRequest.java

@@ -10,6 +10,7 @@ import com.rho.RhoClassFactory;
 //import com.rho.RhoConf;
 import com.rho.FilePath;
 import com.rho.IRhoRubyHelper;
+import com.rho.Mutex;
 import com.rho.RhoConf;
 import com.rho.RhoEmptyLogger;
 import com.rho.RhoLogger;
@@ -24,6 +25,9 @@ public class NetRequest
 {
 	private static final RhoLogger LOG = RhoLogger.RHO_STRIP_LOG ? new RhoEmptyLogger() : 
 		new RhoLogger("Net");
+	RhoConf RHOCONF(){ return RhoConf.getInstance(); }
+	
+	private final int MAX_RECONNECT_COUNT = 3;
 	
 	boolean m_bCancel = false;
 	boolean m_sslVerifyPeer = true;
@@ -144,88 +148,116 @@ public class NetRequest
 		}
 	}
 	
+	Mutex m_mxNet = new Mutex();
 	public NetResponse doRequest(String strMethod, String strUrl, String strBody, IRhoSession oSession, Hashtable headers ) throws Exception
     {
+		m_bCancel = false;
+		int nTry = 0;
 		String strRespBody = null;
-		InputStream is = null;
-		OutputStream os = null;
 		int code = -1;
 		
-		m_bCancel = false;
-		try{
-			closeConnection();
-			m_connection = RhoClassFactory.getNetworkAccess().connect(strUrl, m_bIgnoreSuffixOnSim);
-			LOG.INFO("connection done");
-			
-			handleCookie(oSession);
-			//m_connection.setRequestProperty("Connection", "keep-alive");
-			//m_connection.setRequestProperty("Accept", "application/x-www-form-urlencoded,application/json,text/html");
+		do
+		{
+			InputStream is = null;
+			OutputStream os = null;
 			
-			if ( strBody != null && strBody.length() > 0 )
-			{
-				if ( oSession != null )
-					m_connection.setRequestProperty("Content-Type", oSession.getContentType());
-				else
-					m_connection.setRequestProperty("Content-Type", "application/x-www-form-urlencoded");
-
-				writeHeaders(headers);
-				LOG.INFO("writeHeaders done");
-				//m_connection.setRequestMethod(IHttpConnection.POST);
-				m_connection.setRequestMethod(strMethod);
+			try{
+				//m_mxNet.Lock();
+				closeConnection();
 				
-				os = m_connection.openOutputStream();
-				os.write(strBody.getBytes(), 0, strBody.length());
-				LOG.INFO("write body done");
-			}else
-			{
-				writeHeaders(headers);
-				m_connection.setRequestMethod(strMethod);
-			}
-
-			is = m_connection.openInputStream();
-			LOG.INFO("openInputStream done");
-			
-			code = m_connection.getResponseCode();
-			LOG.INFO("getResponseCode : " + code);
-			
-			readHeaders(headers);
-			copyHashtable(m_OutHeaders, headers);
-			
-			if ( code >= 400 ) 
-			{
-				LOG.ERROR("Error retrieving data: " + code);
-				if (code == IHttpConnection.HTTP_UNAUTHORIZED && oSession != null)
+				//LOG.INFO("GC start.");
+				//System.gc();
+				//LOG.INFO("GC stop.");
+				
+				m_connection = RhoClassFactory.getNetworkAccess().connect(strUrl, m_bIgnoreSuffixOnSim);
+				LOG.INFO("connection done");
+				
+				handleCookie(oSession);
+				//m_connection.setRequestProperty("Connection", "keep-alive");
+				//m_connection.setRequestProperty("Accept", "application/x-www-form-urlencoded,application/json,text/html");
+				
+				if ( strBody != null && strBody.length() > 0 )
 				{
-					LOG.ERROR("Unauthorize error.Client will be logged out");
-					oSession.logout();
+					if ( oSession != null )
+						m_connection.setRequestProperty("Content-Type", oSession.getContentType());
+					else
+						m_connection.setRequestProperty("Content-Type", "application/x-www-form-urlencoded");
+	
+					writeHeaders(headers);
+					LOG.INFO("writeHeaders done");
+					//m_connection.setRequestMethod(IHttpConnection.POST);
+					m_connection.setRequestMethod(strMethod);
+					
+					os = m_connection.openOutputStream();
+					os.write(strBody.getBytes(), 0, strBody.length());
+					LOG.INFO("write body done");
+				}else
+				{
+					writeHeaders(headers);
+					LOG.INFO("writeHeaders done");
+					m_connection.setRequestMethod(strMethod);
 				}
+	
+				is = m_connection.openInputStream();
+				LOG.INFO("openInputStream done");
+				
+				code = m_connection.getResponseCode();
+				LOG.INFO("getResponseCode : " + code);
 				
-				//if ( code != IHttpConnection.HTTP_INTERNAL_ERROR )
+				readHeaders(headers);
+				copyHashtable(m_OutHeaders, headers);
+				
+				if ( code >= 400 ) 
 				{
+					LOG.ERROR("Error retrieving data: " + code);
+					if (code == IHttpConnection.HTTP_UNAUTHORIZED && oSession != null)
+					{
+						LOG.ERROR("Unauthorize error.Client will be logged out");
+						oSession.logout();
+					}
+					
+					//if ( code != IHttpConnection.HTTP_INTERNAL_ERROR )
+					{
+						strRespBody = readFully(is, getResponseEncoding());
+				        if ( !RHOCONF().getBool("log_skip_post") )	        
+				        	LOG.TRACE("Response body: " + strRespBody );
+					}
+				}else
+				{
+					long len = m_connection.getLength();
+					LOG.INFO("fetchRemoteData data size:" + len );
+			
 					strRespBody = readFully(is, getResponseEncoding());
-					LOG.TRACE("Response body: " + strRespBody );
+					
+					LOG.INFO("fetchRemoteData data readFully.");
 				}
-			}else
+				
+				break;
+			}catch(IOException exc)
 			{
-				long len = m_connection.getLength();
-				LOG.INFO("fetchRemoteData data size:" + len );
-		
-				strRespBody = readFully(is, getResponseEncoding());
+				String strError = exc.getMessage();
+				LOG.INFO("openInputStream failed: " + strError);
+				if ( strError != null && strError.indexOf("General socket error") >= 0)
+				{
+					LOG.INFO("Try connect one more time.");
+				}else
+					throw exc;
+			}
+			finally
+			{
+				if ( is != null )
+					try{ is.close(); }catch(IOException exc){}
+				if ( os != null )
+					try{ os.close(); }catch(IOException exc){}
+				
+				closeConnection();
+				
+				m_bIgnoreSuffixOnSim = true;
 				
-				LOG.INFO("fetchRemoteData data readFully.");
+				//m_mxNet.Unlock();			
 			}
-
-		}finally
-		{
-			if ( is != null )
-				try{ is.close(); }catch(IOException exc){}
-			if ( os != null )
-				try{ os.close(); }catch(IOException exc){}
-			
-			closeConnection();
-			
-			m_bIgnoreSuffixOnSim = true;
-		}
+			nTry++;
+		}while( !m_bCancel && nTry <= MAX_RECONNECT_COUNT );
 		
 		return makeResponse(strRespBody, code );
     }
@@ -348,114 +380,131 @@ public class NetRequest
     public NetResponse pushMultipartData(String strUrl, Vector/*Ptr<CMultipartItem*>&*/ arItems, IRhoSession oSession, Hashtable/*<String,String>**/ headers)throws Exception
     {
 		String strRespBody = null;
-		InputStream is = null;
-		OutputStream os = null;
 		int code  = -1;
+		int nTry = 0;
 		
 		m_bCancel = false;
     	
-		try{
-			closeConnection();
-			m_connection = RhoClassFactory.getNetworkAccess().connect(strUrl, false);
-			
-			handleCookie(oSession);
-
-			m_connection.setRequestProperty("Connection", "keep-alive");
-			m_connection.setRequestProperty("content-type", szMultipartContType);
-			writeHeaders(headers);
-			m_connection.setRequestMethod(IHttpConnection.POST);
+		do
+		{
+			InputStream is = null;
+			OutputStream os = null;
 			
-			//PUSH specific
-			processMultipartItems( arItems );
-			os = m_connection.openOutputStream();
-	        //write all items
-	        for( int i = 0; i < (int)arItems.size(); i++ )
-	        {
-	            MultipartItem oItem = (MultipartItem)arItems.elementAt(i); 
-    			os.write(oItem.m_strDataPrefix.getBytes(), 0, oItem.m_strDataPrefix.length());
-
-	            if ( oItem.m_strFilePath.length() > 0 )
-	            {
-
-		        	SimpleFile file = null;
-		    		InputStream fis = null;
-		        	
-		    		try{
-		    			file = RhoClassFactory.createFile();
-		    			file.open(oItem.m_strFilePath, true, true);
-		        		
-		    			if ( !file.isOpened() ){
-		    				LOG.ERROR("File not found: " + oItem.m_strFilePath);
-		    				throw new RuntimeException("File not found:" + oItem.m_strFilePath);
-		    			}
-		    			
-		    			fis = file.getInputStream();
-		    			byte[]  byteBuffer = new byte[1024*4]; 
-		    			int nRead = 0;
-		        		do{
-		        			nRead = fis.read(byteBuffer);	    			
-		        			if ( nRead > 0 )
-		        				os.write(byteBuffer, 0, nRead);
-		        		}while( nRead > 0 );
-		    		}finally{
-						if (fis != null)
-							try{ fis.close(); }catch(IOException e){}
+			try{
+				closeConnection();
+				m_connection = RhoClassFactory.getNetworkAccess().connect(strUrl, false);
+				
+				handleCookie(oSession);
+	
+				m_connection.setRequestProperty("Connection", "keep-alive");
+				m_connection.setRequestProperty("content-type", szMultipartContType);
+				writeHeaders(headers);
+				m_connection.setRequestMethod(IHttpConnection.POST);
+				
+				//PUSH specific
+				processMultipartItems( arItems );
+				os = m_connection.openOutputStream();
+		        //write all items
+		        for( int i = 0; i < (int)arItems.size(); i++ )
+		        {
+		            MultipartItem oItem = (MultipartItem)arItems.elementAt(i); 
+	    			os.write(oItem.m_strDataPrefix.getBytes(), 0, oItem.m_strDataPrefix.length());
+	
+		            if ( oItem.m_strFilePath.length() > 0 )
+		            {
+	
+			        	SimpleFile file = null;
+			    		InputStream fis = null;
+			        	
+			    		try{
+			    			file = RhoClassFactory.createFile();
+			    			file.open(oItem.m_strFilePath, true, true);
+			        		
+			    			if ( !file.isOpened() ){
+			    				LOG.ERROR("File not found: " + oItem.m_strFilePath);
+			    				throw new RuntimeException("File not found:" + oItem.m_strFilePath);
+			    			}
+			    			
+			    			fis = file.getInputStream();
+			    			byte[]  byteBuffer = new byte[1024*4]; 
+			    			int nRead = 0;
+			        		do{
+			        			nRead = fis.read(byteBuffer);	    			
+			        			if ( nRead > 0 )
+			        				os.write(byteBuffer, 0, nRead);
+			        		}while( nRead > 0 );
+			    		}finally{
+							if (fis != null)
+								try{ fis.close(); }catch(IOException e){}
+			    			
+			    			if ( file != null )
+			    				try{ file.close(); }catch(IOException e){}
+			    		}
 		    			
-		    			if ( file != null )
-		    				try{ file.close(); }catch(IOException e){}
-		    		}
-	    			
-	            }else
-	            {
-	    			os.write(oItem.m_strBody.getBytes(), 0, oItem.m_strBody.length());
-	            }
-	        }
-			os.write(szMultipartPostfix.getBytes(), 0, szMultipartPostfix.length());
-			//os.flush();
-			//PUSH specific
-			
-			is = m_connection.openInputStream();
-			code = m_connection.getResponseCode();
-		
-			LOG.INFO("getResponseCode : " + code);
-
-			readHeaders(headers);
-			copyHashtable(m_OutHeaders, headers);
+		            }else
+		            {
+		    			os.write(oItem.m_strBody.getBytes(), 0, oItem.m_strBody.length());
+		            }
+		        }
+				os.write(szMultipartPostfix.getBytes(), 0, szMultipartPostfix.length());
+				//os.flush();
+				//PUSH specific
+				
+				is = m_connection.openInputStream();
+				code = m_connection.getResponseCode();
 			
-			if (code >= 400 ) 
-			{
-				LOG.ERROR("Error retrieving data: " + code);
-				if (code == IHttpConnection.HTTP_UNAUTHORIZED)
-				{
-					LOG.ERROR("Unauthorize error.Client will be logged out");
-					oSession.logout();
-				}
+				LOG.INFO("getResponseCode : " + code);
+	
+				readHeaders(headers);
+				copyHashtable(m_OutHeaders, headers);
 				
-				//if ( code != IHttpConnection.HTTP_INTERNAL_ERROR )
+				if (code >= 400 ) 
+				{
+					LOG.ERROR("Error retrieving data: " + code);
+					if (code == IHttpConnection.HTTP_UNAUTHORIZED)
+					{
+						LOG.ERROR("Unauthorize error.Client will be logged out");
+						oSession.logout();
+					}
+					
+					//if ( code != IHttpConnection.HTTP_INTERNAL_ERROR )
+						strRespBody = readFully(is, getResponseEncoding());
+						
+				        if ( !RHOCONF().getBool("log_skip_post") )	        
+				        	LOG.TRACE("Response body: " + strRespBody );
+					
+				}else
+				{
+					long len = m_connection.getLength();
+					LOG.INFO("fetchRemoteData data size:" + len );
+			
 					strRespBody = readFully(is, getResponseEncoding());
-					LOG.TRACE("Response body: " + strRespBody );
+					
+					LOG.INFO("fetchRemoteData data readFully.");
+				}
 				
-			}else
+				break;
+			}catch(IOException exc)
 			{
-				long len = m_connection.getLength();
-				LOG.INFO("fetchRemoteData data size:" + len );
-		
-				strRespBody = readFully(is, getResponseEncoding());
-				
-				LOG.INFO("fetchRemoteData data readFully.");
+				String strError = exc.getMessage();
+				LOG.INFO("openInputStream failed: " + strError);
+				if ( strError != null && strError.indexOf("General socket error") >= 0)
+				{
+					LOG.INFO("Try connect one more time.");
+				}else
+					throw exc;
+			}finally{
+				try{
+					if ( is != null )
+						is.close();
+					if (os != null)
+						os.close();
+					
+					closeConnection();
+					
+				}catch(IOException exc2){}
 			}
-			
-		}finally{
-			try{
-				if ( is != null )
-					is.close();
-				if (os != null)
-					os.close();
-				
-				closeConnection();
-				
-			}catch(IOException exc2){}
-		}
+		}while( !m_bCancel && nTry <= MAX_RECONNECT_COUNT );
 		
 		return makeResponse(strRespBody, code );
     }
@@ -507,85 +556,101 @@ public class NetRequest
 	NetResponse pullFile1( String strUrl, IRAFile file, long nStartPos, IRhoSession oSession, Hashtable headers )throws Exception
 	{
 		String strRespBody = null;
-		InputStream is = null;
 		int code = -1;
+		int nTry = 0;
 		
-		try{
-			closeConnection();
-			m_connection = RhoClassFactory.getNetworkAccess().connect(strUrl, true);
-			
-			handleCookie(oSession);
-
-			m_connection.setRequestProperty("Connection", "keep-alive");
+		do
+		{
+			InputStream is = null;
 			
-			if ( nStartPos > 0 || m_nMaxPacketSize > 0 )
-			{
-				if ( m_nMaxPacketSize > 0 )
-					m_connection.setRequestProperty("Range", "bytes="+nStartPos+"-" + (nStartPos + m_nMaxPacketSize-1));
+			try{
+				closeConnection();
+				m_connection = RhoClassFactory.getNetworkAccess().connect(strUrl, true);
+				
+				handleCookie(oSession);
+	
+				m_connection.setRequestProperty("Connection", "keep-alive");
+				
+				if ( nStartPos > 0 || m_nMaxPacketSize > 0 )
+				{
+					if ( m_nMaxPacketSize > 0 )
+						m_connection.setRequestProperty("Range", "bytes="+nStartPos+"-" + (nStartPos + m_nMaxPacketSize-1));
+					else
+						m_connection.setRequestProperty("Range", "bytes="+nStartPos+"-");
+				}
+				writeHeaders(headers);
+				
+				m_connection.setRequestMethod(IHttpConnection.GET);
+				
+				is = m_connection.openInputStream();
+				
+				code = m_connection.getResponseCode();
+				
+				LOG.INFO("getResponseCode : " + code);
+				
+				m_nCurDownloadSize = 0;
+				readHeaders(headers);
+	
+				if ( code == IHttpConnection.HTTP_OK )
+					file.seek(0);
+				
+				if ( code == IHttpConnection.HTTP_RANGENOTSATISFY )
+					code = IHttpConnection.HTTP_PARTIAL_CONTENT;
 				else
-					m_connection.setRequestProperty("Range", "bytes="+nStartPos+"-");
-			}
-			writeHeaders(headers);
-			
-			m_connection.setRequestMethod(IHttpConnection.GET);
-			
-			is = m_connection.openInputStream();
-			
-			code = m_connection.getResponseCode();
-			
-			LOG.INFO("getResponseCode : " + code);
-			
-			m_nCurDownloadSize = 0;
-			readHeaders(headers);
-
-			if ( code == IHttpConnection.HTTP_OK )
-				file.seek(0);
-			
-			if ( code == IHttpConnection.HTTP_RANGENOTSATISFY )
-				code = IHttpConnection.HTTP_PARTIAL_CONTENT;
-			else
-			{
-				if (code >= 400 && code != IHttpConnection.HTTP_PARTIAL_CONTENT ) 
 				{
-					LOG.ERROR("Error retrieving data: " + code);
-					if (code == IHttpConnection.HTTP_UNAUTHORIZED)
+					if (code >= 400 && code != IHttpConnection.HTTP_PARTIAL_CONTENT ) 
 					{
-						LOG.ERROR("Unauthorize error.Client will be logged out");
-						oSession.logout();
+						LOG.ERROR("Error retrieving data: " + code);
+						if (code == IHttpConnection.HTTP_UNAUTHORIZED)
+						{
+							LOG.ERROR("Unauthorize error.Client will be logged out");
+							oSession.logout();
+						}
+						
+						strRespBody = readFully(is, getResponseEncoding());
+					}else
+					{
+						int nRead = 0;
+						
+						byte[]  byteBuffer = new byte[1024*20]; 
+	
+			    		do{
+			    			nRead = /*bufferedReadByByte(m_byteBuffer, is);*/is.read(byteBuffer);
+			    			if ( nRead > 0 )
+			    			{
+			    				file.write(byteBuffer, 0, nRead);
+			    				
+			    				if (m_bFlushFileAfterWrite)
+			    					file.sync();
+	
+			    				m_nCurDownloadSize += nRead;
+			    			}
+			    		}while( !m_bCancel && nRead >= 0 );
+			    		
+			    		if ( code == IHttpConnection.HTTP_OK || (code == IHttpConnection.HTTP_PARTIAL_CONTENT && isFinishDownload()) )
+			    			m_nCurDownloadSize = 0;
 					}
 					
-					strRespBody = readFully(is, getResponseEncoding());
-				}else
-				{
-					int nRead = 0;
-					
-					byte[]  byteBuffer = new byte[1024*20]; 
-
-		    		do{
-		    			nRead = /*bufferedReadByByte(m_byteBuffer, is);*/is.read(byteBuffer);
-		    			if ( nRead > 0 )
-		    			{
-		    				file.write(byteBuffer, 0, nRead);
-		    				
-		    				if (m_bFlushFileAfterWrite)
-		    					file.sync();
-
-		    				m_nCurDownloadSize += nRead;
-		    			}
-		    		}while( !m_bCancel && nRead >= 0 );
-		    		
-		    		if ( code == IHttpConnection.HTTP_OK || (code == IHttpConnection.HTTP_PARTIAL_CONTENT && isFinishDownload()) )
-		    			m_nCurDownloadSize = 0;
 				}
 				
+				break;
+			}catch(IOException exc)
+			{
+				String strError = exc.getMessage();
+				LOG.INFO("openInputStream failed: " + strError);
+				if ( strError != null && strError.indexOf("General socket error") >= 0)
+				{
+					LOG.INFO("Try connect one more time.");
+				}else
+					throw exc;
+			}finally
+			{
+				if ( is != null )
+					try{ is.close(); }catch(IOException exc){}
+				
+				closeConnection();
 			}
-		}finally
-		{
-			if ( is != null )
-				try{ is.close(); }catch(IOException exc){}
-			
-			closeConnection();
-		}
+		}while( !m_bCancel && nTry <= MAX_RECONNECT_COUNT );
 		
 		return makeResponse(strRespBody != null ? strRespBody : "", code );
 	}