Fixes #601

Fixes #602
couchbase · Mar 2, 2016 · a9ec1f5 · a9ec1f5
1 parent b60dda0
commit a9ec1f5
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 35 deletions.
diff --git a/src/Couchbase.Lite.Shared/Replication.cs b/src/Couchbase.Lite.Shared/Replication.cs
@@ -1280,9 +1280,7 @@ internal HttpRequestMessage SendAsyncRequest(HttpMethod method, Uri url, Object
                             if(response.IsCanceled) {
                                 error = new Exception("SendAsyncRequest Task has been canceled.");
                             } else {
-                                error = error is AggregateException
-                                    ? response.Exception.Flatten()
-                                    : response.Exception;
+                                error = Misc.Flatten(response.Exception);
                             }
 
                             if(error == null) {
@@ -1725,8 +1723,10 @@ private void FetchRemoteCheckpointDoc()
 
                             Log.To.Sync.I(TAG, "{0} replicating from lastSequence={1}", this, LastSequence);
                         } else {
-                            Log.To.Sync.I(TAG, "{0} lastSequence mismatch: I had {1}, remote had {2} (response = {3}",
+                            Log.To.Sync.I(TAG, "{0} lastSequence mismatch: I had {1}, remote had {2} (response = {3}, " +
+                                "resetting lastSequence to 0",
                                 this, localLastSequence, remoteLastSequence, response);
+                            _lastSequence = "0";
                         }
 
                         BeginReplicating ();

diff --git a/src/Couchbase.Lite.Shared/Util/CustomLogger.cs b/src/Couchbase.Lite.Shared/Util/CustomLogger.cs
@@ -71,20 +71,6 @@ public CustomLogger()
 
         #endregion
 
-        #region Private Methods
-
-        private static Exception Flatten(Exception tr)
-        {
-            if (!(tr is AggregateException)) {
-                return tr;
-            }
-
-            var err = ((AggregateException)tr).Flatten().InnerException;
-            return err;
-        }
-
-        #endregion
-
         #region ILogger
 
         public void V(string tag, string msg)
@@ -101,7 +87,7 @@ public void V(string tag, string msg, Exception tr)
             }
 
             lock (_locker) {
-                _ts.WriteLine(SourceLevels.Verbose, String.Format("{0}:\r\n{1}", msg, Flatten(tr)), tag); 
+                _ts.WriteLine(SourceLevels.Verbose, String.Format("{0}:\r\n{1}", msg, Misc.Flatten(tr)), tag); 
             }
         }
 
@@ -129,7 +115,7 @@ public void D(string tag, string msg, Exception tr)
             }
 
             lock (_locker) { 
-                _ts.WriteLine(SourceLevels.ActivityTracing, String.Format("{0}:\r\n{1}", msg, Flatten(tr)), tag); 
+                _ts.WriteLine(SourceLevels.ActivityTracing, String.Format("{0}:\r\n{1}", msg, Misc.Flatten(tr)), tag); 
             }
         }
 
@@ -147,7 +133,7 @@ public void I(string tag, string msg, Exception tr)
             }
 
             lock (_locker) {
-                _ts.WriteLine(SourceLevels.Information, String.Format("{0}:\r\n{1}", msg, Flatten(tr)), tag); 
+                _ts.WriteLine(SourceLevels.Information, String.Format("{0}:\r\n{1}", msg, Misc.Flatten(tr)), tag); 
             }
         }
 
@@ -166,7 +152,7 @@ public void W(string tag, string msg)
         public void W(string tag, Exception tr)
         {
             lock (_locker) {
-                _ts.WriteLine(Flatten(tr).Message, tag); 
+                _ts.WriteLine(Misc.Flatten(tr).Message, tag); 
             }
         }
 
@@ -177,7 +163,7 @@ public void W(string tag, string msg, Exception tr)
             }
 
             lock (_locker) { 
-                _ts.WriteLine(SourceLevels.Warning, String.Format("{0}:\r\n{1}", msg, Flatten(tr)), tag); 
+                _ts.WriteLine(SourceLevels.Warning, String.Format("{0}:\r\n{1}", msg, Misc.Flatten(tr)), tag); 
             }
         }
 
@@ -200,7 +186,7 @@ public void E(string tag, string msg, Exception tr)
             }
 
             lock (_locker) { 
-                _ts.Fail(String.Format("{0}: {1}", tag, msg), Flatten(tr).ToString()); 
+                _ts.Fail(String.Format("{0}: {1}", tag, msg), Misc.Flatten(tr).ToString()); 
             }
         }
 

diff --git a/src/Couchbase.Lite.Shared/Util/ExtensionMethods.cs b/src/Couchbase.Lite.Shared/Util/ExtensionMethods.cs
@@ -107,16 +107,6 @@ public static string ReplaceAll (this string str, string regex, string replaceme
 
             return rgx.Replace (str, replacement);
         }
-
-        public static Exception Flatten(this Exception e)
-        {
-            var ae = e as AggregateException;
-            if (ae == null) {
-                return e;
-            }
-
-            return ae.Flatten().InnerException;
-        }
 
         public static long MillisecondsSinceEpoch(this DateTime dt)
         {

diff --git a/src/Couchbase.Lite.Shared/Util/Misc.cs b/src/Couchbase.Lite.Shared/Util/Misc.cs
@@ -68,6 +68,16 @@ public static DateTime CreateDate(long milliSecondsSinceEpoch)
             return Epoch.AddMilliseconds(milliSecondsSinceEpoch);
         }
 
+        public static Exception Flatten(Exception inE)
+        {
+            var ae = inE as AggregateException;
+            if (ae == null) {
+                return inE;
+            }
+
+            return ae.Flatten().InnerException;
+        }
+
         public static void SafeDispose<T>(ref T obj) where T : class, IDisposable
         {
             var tmp = obj;

diff --git a/src/Couchbase.Lite.Shared/Util/TransientErrorRetryHandler.cs b/src/Couchbase.Lite.Shared/Util/TransientErrorRetryHandler.cs
@@ -47,7 +47,7 @@ static Task<HttpResponseMessage> HandleTransientErrors(Task<HttpResponseMessage>
                 return request;
             }
 
-            var error = request.Exception.Flatten().InnerException;
+            var error = Misc.Flatten(request.Exception);
 
             if (!Misc.IsTransientNetworkError(error) || strategy.RetriesRemaining == 0)
             {