Revert "Fix a bug where Metacube streams would become inconsistent between different...
authorSteinar H. Gunderson <sgunderson@bigfoot.com>
Sat, 20 Apr 2013 12:12:41 +0000 (14:12 +0200)
committerSteinar H. Gunderson <sgunderson@bigfoot.com>
Sat, 20 Apr 2013 12:12:41 +0000 (14:12 +0200)
Doesn't actually fix the issue.

This reverts commit 5605c88a27fcf64ea8f6fd6cbb52dada73856ee0.

main.cpp

index 0aa91f3..c89ec72 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -153,9 +153,9 @@ void create_streams(const Config &config,
                                            Stream::Encoding(stream_config.encoding));
                } else {
                        servers->set_backlog_size(stream_config.stream_id, stream_config.backlog_size);
                                            Stream::Encoding(stream_config.encoding));
                } else {
                        servers->set_backlog_size(stream_config.stream_id, stream_config.backlog_size);
+                       servers->set_encoding(stream_config.stream_id,
+                                             Stream::Encoding(stream_config.encoding));
                }
                }
-               servers->set_encoding(stream_config.stream_id,
-                                     Stream::Encoding(stream_config.encoding));
                expecting_stream_ids.erase(stream_config.stream_id);
 
                if (stream_config.mark_pool != -1) {
                expecting_stream_ids.erase(stream_config.stream_id);
 
                if (stream_config.mark_pool != -1) {