Release 1.5

hhblaze · Dec 9, 2020 · 8955120 · 8955120
1 parent 29f4bb5
commit 8955120
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 7 deletions.
diff --git a/SPEntitySyncingClient/SyncStrategyV1.cs b/SPEntitySyncingClient/SyncStrategyV1.cs
@@ -144,17 +144,23 @@ public override bool UpdateLocalDatabase(ExchangeData exData) //(List<SyncOperat
                         {
                             var oldEntity = rowLocalEntity.GetDataBlockWithFixedAddress<T>();
 
-                            //Setting value from the server to this ID (real entity that must belong to that id)
-                            tran.InsertDataBlockWithFixedAddress<byte[]>(_entitySync.GetEntityContentTable, rowLocalEntity.Value, opr.SerializedObject);
-
+                            _entitySync.ptrContent = null;
+
                             //New GeneratedID must be stored for the new sync
                             ((ISyncEntity)oldEntity).Id = opr.ExternalId; //Theoretically on this place can be called a user-function to get another ID type
-                            ((ISyncEntity)oldEntity).SyncTimestamp = ++now;  //must be returned back, overriding SyncTimeStamp         
-                            
+                            ((ISyncEntity)oldEntity).SyncTimestamp = ++now;  //must be returned back, overriding SyncTimeStamp                                     
+
                             _entitySync.OnInsertEntity(oldEntity, default(T), DBreeze.Utils.CustomSerializator.ByteArraySerializator(oldEntity), opr.InternalId);
 
                             InsertIndex4Sync(tran, _entitySync.entityTable, oldEntity, _entitySync.ptrContent, default(T));
 
+
+                            //Setting value from the server for the existing ID (real entity that must belong to that id)
+                            _entitySync.ptrContent = rowLocalEntity.Value;                          
+
+                            _entitySync.OnInsertEntity((T)DBreeze.Utils.CustomSerializator.ByteArrayDeSerializator(opr.SerializedObject, typeof(T)), default(T),
+                                opr.SerializedObject, 0);
+
                             reRunSync = true;
                         }
                     }

diff --git a/_Deployment/EntitySyncing.nuspec b/_Deployment/EntitySyncing.nuspec
@@ -2,7 +2,7 @@
 <package >
   <metadata>
     <id>EntitySyncingServer</id>
-    <version>1.004.2020.1208</version>
+    <version>1.005.2020.1209</version>
     <title>EntitySyncingServer</title>
     <authors>hhblaze@gmail.com</authors>
     <owners>https://tiesky.com</owners>   

diff --git a/_Deployment/EntitySyncingClient.1.4.2020.1208.nupkg b/_Deployment/EntitySyncingClient.1.4.2020.1208.nupkg
diff --git a/_Deployment/EntitySyncingClient.1.5.2020.1209.nupkg b/_Deployment/EntitySyncingClient.1.5.2020.1209.nupkg
diff --git a/_Deployment/EntitySyncingClient.nuspec b/_Deployment/EntitySyncingClient.nuspec
@@ -2,7 +2,7 @@
 <package >
   <metadata>
     <id>EntitySyncingClient</id>
-    <version>1.004.2020.1208</version>
+    <version>1.005.2020.1209</version>
     <title>EntitySyncingClient</title>
     <authors>hhblaze@gmail.com</authors>
     <owners>https://tiesky.com</owners>   

diff --git a/...t/EntitySyncingServer.1.4.2020.1208.nupkg → ...t/EntitySyncingServer.1.5.2020.1209.nupkg b/...t/EntitySyncingServer.1.4.2020.1208.nupkg → ...t/EntitySyncingServer.1.5.2020.1209.nupkg