Fixed invalid collation in MongoDBJournal

sweetlandj · Feb 13, 2018 · 1540b59 · 1540b59
1 parent cfda0eb
commit 1540b59
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/Source/Platibus.MongoDB/MongoDBMessageJournal.cs b/Source/Platibus.MongoDB/MongoDBMessageJournal.cs
@@ -41,7 +41,7 @@ namespace Platibus.MongoDB
     /// </summary>
     public class MongoDBMessageJournal : IMessageJournal
     {
-        private static readonly Collation Collation = new Collation("simple", strength: CollationStrength.Secondary);
+        private readonly Collation _collation = new Collation("simple");
 
         /// <summary>
         /// The default name of the collection that will be used to store message journal entries
@@ -85,6 +85,10 @@ public MongoDBMessageJournal(ConnectionStringSettings connectionStringSettings,
 
             var minServerVersion = database.Client.Cluster.Description.Servers.Min(s => s.Version);
             _collationSupported = Feature.Collation.IsSupported(minServerVersion);
+            if (_collationSupported)
+            {
+                 _collation = new Collation("en", strength: CollationStrength.Secondary);
+            }
 
             _diagnosticService = diagnosticService ?? DiagnosticService.DefaultInstance;
 
@@ -97,7 +101,7 @@ private void CreateIndexes()
             var options = new CreateIndexOptions();
             if (_collationSupported)
             {
-                options.Collation = Collation;
+                options.Collation = _collation;
             }
 
             TryCreateIndex(ikb.Ascending(c => c.Category), "category_1");
@@ -118,7 +122,7 @@ private void TryCreateIndex(IndexKeysDefinition<MessageJournalEntryDocument> ind
 
             if (_collationSupported)
             {
-                options.Collation = Collation;
+                options.Collation = _collation;
             }
 
             try
@@ -185,7 +189,7 @@ public Task<MessageJournalPosition> GetBeginningOfJournal(CancellationToken canc
             var options = new FindOptions();
             if (_collationSupported)
             {
-                options.Collation = Collation;
+                options.Collation = _collation;
             }
 
             var entryDocuments = await _messageJournalEntries.Find(filterDef, options)