Merge pull request #139 from bjorg/MTP-557

MTP-557 TimedAccumulator<T> calls handler with null on Dispose() when there are no items in the accumulator.
MindTouch · Jul 2, 2015 · 9bf42cf · 9bf42cf
2 parents d71fcd4 + c364d92
commit 9bf42cf
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 10 deletions.
diff --git a/src/mindtouch.dream/dream/dreammessage.cs b/src/mindtouch.dream/dream/dreammessage.cs
@@ -848,10 +848,6 @@ public DreamMessage(DreamStatus status, DreamHeaders headers, MimeType contentTy
                     _bytes = ((MemoryStream)_stream).ToArray();
                     _stream = null;
                     _streamOpen = false;
-                } else if(_stream is MemoryStream) {
-                    _bytes = ((MemoryStream)_stream).ToArray();
-                    _stream = null;
-                    _streamOpen = false;
                 } else {
 
                     // NOTE: the content-length and body length may differ (e.g. HEAD verb)

diff --git a/src/mindtouch.dream/system/Collections/TimedAccumulator.cs b/src/mindtouch.dream/system/Collections/TimedAccumulator.cs
@@ -87,9 +87,7 @@ public class TimedAccumulator<T> : IDisposable {
                     dispatch = ExtractItems(_items, _maxItems);
                 }
             }
-            if(dispatch != null) {
-                CallHandler(dispatch);
-            }
+            CallHandler(dispatch);
         }
 
         public void Dispose() {
@@ -110,6 +108,9 @@ public class TimedAccumulator<T> : IDisposable {
         }
 
         private void CallHandler(IEnumerable<T> items) {
+            if(items.NullOrEmpty()) {
+                return;
+            }
             try {
                 _handler(items);
             } catch(Exception e) {
@@ -127,9 +128,7 @@ public class TimedAccumulator<T> : IDisposable {
             lock(_items) {
                 dispatch = ExtractItems(_items, _items.Count);
             }
-            if(dispatch != null) {
-                CallHandler(dispatch);
-            }
+            CallHandler(dispatch);
         }
     }
 }