rhodes 3.0.2 → 3.1.0.beta.1

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

@@ -24,6 +24,7 @@ public class RhoConnection implements IHttpConnection {
 
 	private static final RhoLogger LOG = RhoLogger.RHO_STRIP_LOG ? new RhoEmptyLogger() : 
 		new RhoLogger("RhoConnection");
+	RhoConf RHOCONF(){ return RhoConf.getInstance(); }
 	
 	/** Request URI **/
 	URI uri, uri_orig;
@@ -394,7 +395,7 @@ public class RhoConnection implements IHttpConnection {
 			
 			String res = strPath.substring(nStart, nEnd);
 			nStart = nEnd+1;
-			return res;
+			return URI.urlDecode(res).trim();
 		}
 	
 	}
@@ -470,6 +471,8 @@ public class RhoConnection implements IHttpConnection {
 			return "image/gif";
 		else if ( strExt.equals("html") || strExt.equals("htm") )
 			return "text/html";
+		else if ( strExt.equals("txt") )
+			return "text/plain";
 		
 		return "";
 	}
@@ -773,8 +776,10 @@ public class RhoConnection implements IHttpConnection {
 		reqHash.setProperty("request-uri", uri.getPath());
 		reqHash.setProperty("request-query", uri.getQueryString());
 		
-		if ( postData != null && postData.size() > 0 ){
-			LOG.TRACE(postData.toString());
+		if ( postData != null && postData.size() > 0 )
+		{
+	        if ( !RHOCONF().getBool("log_skip_post") )	        
+	        	LOG.TRACE(postData.toString());
 			reqHash.setProperty("request-body", postData.toString());
 		}
 		
@@ -798,21 +803,28 @@ public class RhoConnection implements IHttpConnection {
 			}else
 			{
 				String strContType = getContentType();
-				if ( this.method.equals("POST") || strContType.length() == 0 ||
-						strContType.indexOf("application/x-www-form-urlencoded") >= 0)
+				
+				if ( uri.getPath().startsWith("/apps/public"))
 				{
-					if ( dispatch() )
+					httpServeFile(strContType);
+				}else
+				{
+					if ( this.method.equals("POST") || strContType.length() == 0 ||
+							strContType.indexOf("application/x-www-form-urlencoded") >= 0)
 					{
-						requestProcessed = true;
-						return;
+						if ( dispatch() )
+						{
+							requestProcessed = true;
+							return;
+						}
 					}
-				}
-				
-				if ( /*this.method == "GET" &&*/ httpGetFile(strContType) ){
 					
-				//}else if ( dispatch() ){
-				}else{
-					respondNotFound(strErr);
+					if ( /*this.method == "GET" &&*/ httpGetFile(strContType) ){
+						
+					//}else if ( dispatch() ){
+					}else{
+						respondNotFound(strErr);
+					}
 				}
 			}			
 			requestProcessed = true;
@@ -842,8 +854,9 @@ public class RhoConnection implements IHttpConnection {
 			
 			if ( resBody != null && resBody != RubyConstant.QNIL )
 				strBody = resBody.toRubyString().toString();
-				
-			LOG.TRACE(strBody);
+			
+	        if ( !RHOCONF().getBool("log_skip_post") )	        
+	        	LOG.TRACE(strBody);
 			
 			try{
 				responseData = new ByteArrayInputStream(strBody.getBytes("UTF-8"));

data/platform/bb/RubyVM/src/com/rho/rjson/RJSONTokener.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.rjson;
 
 import org.json.me.*;

data/platform/bb/RubyVM/src/com/rho/sync/ISyncProtocol.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.sync;
 public interface ISyncProtocol
 {

data/platform/bb/RubyVM/src/com/rho/sync/ISyncStatusListener.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.sync;
 
 public interface ISyncStatusListener {

data/platform/bb/RubyVM/src/com/rho/sync/JSONArrayIterator.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.sync;
 
 import org.json.me.RhoJSONArray;

data/platform/bb/RubyVM/src/com/rho/sync/JSONEntry.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.sync;
 import org.json.me.RhoJSONException;
 import org.json.me.RhoJSONObject;

data/platform/bb/RubyVM/src/com/rho/sync/JSONStructIterator.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.sync;
 
 import org.json.me.RhoJSONException;

data/platform/bb/RubyVM/src/com/rho/sync/SyncEngine.java

@@ -1,21 +1,28 @@
-/*
- *  rhodes
- *
- *  Copyright (C) 2008 Rhomobile, Inc. All rights reserved.
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+/*------------------------------------------------------------------------
+* (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.sync;
 
 import com.rho.RhoClassFactory;
@@ -131,7 +138,7 @@ public class SyncEngine implements NetRequest.IRhoSession
     int getState(){ return m_syncState; }
     boolean isSearch(){ return m_bIsSearch; }
     boolean isContinueSync(){ return m_syncState != esExit && m_syncState != esStop; }
-	boolean isSyncing(){ return m_syncState == esSyncAllSources || m_syncState == esSyncSource; }
+	boolean isSyncing(){ return m_syncState == esSyncAllSources || m_syncState == esSyncSource || m_syncState == esSearch; }
     void stopSync()
     { 
     	if (isContinueSync())

data/platform/bb/RubyVM/src/com/rho/sync/SyncNotify.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.sync;
 
 import com.rho.Mutex;

data/platform/bb/RubyVM/src/com/rho/sync/SyncProtocol_3.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.sync;
 
 import com.rho.RhoConf;
@@ -22,7 +48,7 @@ public class SyncProtocol_3 implements ISyncProtocol
 
     public String getLoginBody( String name, String password)
     {
-        return "{\"login\":\"" + name + "\",\"password\":\"" + password + "\",\"remember_me\":1}";
+        return "{\"login\":" + JSONEntry.quoteValue(name) + ",\"password\":" + JSONEntry.quoteValue(password) + ",\"remember_me\":1}";
     }
 
     public String getClientCreateUrl()
@@ -37,10 +63,10 @@ public class SyncProtocol_3 implements ISyncProtocol
 
     public String getClientRegisterBody( String strClientID, String strPin, int nPort, String strType )
     {
-        return "{\"client_id\":\"" + strClientID +
-        	"\",\"device_pin\":\"" + strPin +
-            "\",\"device_port\":\"" + nPort +
-            "\",\"device_type\":\"" + strType + "\"}";
+        return "{\"client_id\":" + JSONEntry.quoteValue(strClientID) +
+        	",\"device_pin\":" + JSONEntry.quoteValue(strPin) +
+            ",\"device_port\":\"" + nPort +
+            "\",\"device_type\":" + JSONEntry.quoteValue(strType) + "}";
     }
 
     public String getClientResetUrl(String strClientID)

data/platform/bb/RubyVM/src/com/rho/sync/SyncSource.java

@@ -1,24 +1,33 @@
-/*
- *  rhodes
- *
- *  Copyright (C) 2008 Rhomobile, Inc. All rights reserved.
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+/*------------------------------------------------------------------------
+* (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.sync;
 
 import com.rho.RhoClassFactory;
+import com.rho.RhoConf;
 import com.rho.RhoEmptyLogger;
 import com.rho.RhoEmptyProfiler;
 import com.rho.RhoLogger;
@@ -44,7 +53,9 @@ public class SyncSource
 	
 	private static final RhoProfiler PROF = RhoProfiler.RHO_STRIP_PROFILER ? new RhoEmptyProfiler() : 
 		new RhoProfiler();
-
+	
+	RhoConf RHOCONF(){ return RhoConf.getInstance(); }
+	
 	static class CAttrValue
 	{
 		String m_strAttrib = "";
@@ -407,7 +418,8 @@ public class SyncSource
 	    if ( bSend && getSync().isContinueSync() )
 	    {
 	        LOG.INFO( "Push client changes to server. Source: " + getName() + "Size :" + strBody.length() );
-	        LOG.TRACE("Push body: " + strBody);		
+	        if ( !RHOCONF().getBool("log_skip_post") )	        
+	        	LOG.TRACE("Push body: " + strBody);		
 
 	        try{
 		        if ( m_arMultipartItems.size() > 0 )
@@ -440,20 +452,20 @@ public class SyncSource
 		    	m_nErrCode = RhoAppAdapter.getNetErrorCode(exc);
 		    	throw exc;
 		    }
-		        
-	    }
 
-	    for( i = 0; i < 3 && m_nErrCode == RhoAppAdapter.ERR_NONE; i++ )
-	    {
-	        if ( arUpdateSent[i] )
-	        {
-	            //oo conflicts
-	            if ( i < 1 && !getSync().getSourceOptions().getBoolProperty(getID(), "pass_through") ) //create
-	                getDB().executeSQL("UPDATE changed_values SET sent=2 WHERE source_id=? and update_type=? and sent=1", getID(), arUpdateTypes[i] );
-	            else
-	            //
-	                getDB().executeSQL("DELETE FROM changed_values WHERE source_id=? and update_type=? and sent=1", getID(), arUpdateTypes[i] );
-	        }
+		    for( i = 0; i < 3 && m_nErrCode == RhoAppAdapter.ERR_NONE; i++ )
+		    {
+		        if ( arUpdateSent[i] )
+		        {
+		            //oo conflicts
+		            if ( i < 1 && !getSync().getSourceOptions().getBoolProperty(getID(), "pass_through") ) //create
+		                getDB().executeSQL("UPDATE changed_values SET sent=2 WHERE source_id=? and update_type=? and sent=1", getID(), arUpdateTypes[i] );
+		            else
+		            //
+		                getDB().executeSQL("DELETE FROM changed_values WHERE source_id=? and update_type=? and sent=1", getID(), arUpdateTypes[i] );
+		        }
+		    }
+		    
 	    }
 
 	    m_arMultipartItems.removeAllElements();
@@ -491,10 +503,10 @@ public class SyncSource
 	        String value = res.getStringByIdx(2);
 	        String attribType = res.getStringByIdx(3);
 
-	        if ( m_hashIgnorePushObjects.containsKey(strObject) )
+	        if ( m_hashIgnorePushObjects.containsKey(strObject) || strObject.length() == 0 )
 	        	continue;
 	        
-	        if ( attribType.compareTo("blob.file") == 0 )
+	        if ( attribType.compareTo("blob.file") == 0 && value.length() > 0 )
 	        {
 	            MultipartItem oItem = new MultipartItem();
 	            oItem.m_strFilePath = RhodesApp.getInstance().resolveDBFilesPath(value);
@@ -642,7 +654,7 @@ public class SyncSource
 	//{"create-error":{"0_broken_object_id":{"name":"wrongname","an_attribute":"error create"},"0_broken_object_id-error":{"message":"error create"}}}
 	boolean processServerErrors(JSONEntry oCmds)throws Exception
 	{
-	    String arErrTypes[] = {"source-error", "search-error", "create-error", "update-error", "delete-error", null};
+	    String arErrTypes[] = {"source-error", "search-error", "create-error", "update-error", "delete-error", "update-rollback", null};
 	    boolean bRes = false;
 	    for( int i = 0; ; i++ )
 	    {
@@ -672,7 +684,7 @@ public class SyncSource
 	            }
 	            else
 	            {
-	                //"create-error", "update-error", "delete-error"
+	                //"create-error", "update-error", "delete-error", "update-rollback"
 	                String strObject = strKey;
 
 	                if ( strObject.endsWith("-error") )