CSHARP-993: Ensure unique ObjectIds across AppDomains.

rstam · rstam · commit 75977d0cc409 · 2014-06-16T11:22:13.000-04:00
diff --git a/MongoDB.Bson/ObjectModel/ObjectId.cs b/MongoDB.Bson/ObjectModel/ObjectId.cs
@@ -47,7 +47,7 @@ public struct ObjectId : IComparable<ObjectId>, IEquatable<ObjectId>, IConvertib
         // static constructor
         static ObjectId()
         {
-            __staticMachine = GetMachineHash();
+            __staticMachine = (GetMachineHash() + AppDomain.CurrentDomain.Id) & 0x00ffffff; // add AppDomain Id to ensure uniqueness across AppDomains
             __staticIncrement = (new Random()).Next();
 
             try

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ public struct ObjectId : IComparable<ObjectId>, IEquatable<ObjectId>, IConvertib`
`47`	`47`	`// static constructor`
`48`	`48`	`static ObjectId()`
`49`	`49`	`{`
`50`		`- __staticMachine = GetMachineHash();`
	`50`	`+ __staticMachine = (GetMachineHash() + AppDomain.CurrentDomain.Id) & 0x00ffffff; // add AppDomain Id to ensure uniqueness across AppDomains`
`51`	`51`	`__staticIncrement = (new Random()).Next();`
`52`	`52`
`53`	`53`	`try`