SERVER-13632 Get rid of DiskLoc::obj (Part 1)

DiskLoc::obj references the durability subsystem through thread local
variables. With this change the accesses become explicit through the
collection.

1 files changed, 4 insertions, 2 deletions

diff --git a/src/mongo/db/exec/working_set_common.cpp b/src/mongo/db/exec/working_set_common.cpp
index 8b9e07a974c..a0652ea5fc0 100644
--- a/src/mongo/db/exec/working_set_common.cpp
+++ b/src/mongo/db/exec/working_set_common.cpp
@@ -26,6 +26,7 @@
  *    it in the license file.
  */
 
+#include "mongo/db/catalog/collection.h"
 #include "mongo/db/exec/working_set.h"
 #include "mongo/db/exec/working_set_common.h"
 #include "mongo/db/pdfile.h"
@@ -33,7 +34,8 @@
 namespace mongo {
 
     // static
-    bool WorkingSetCommon::fetchAndInvalidateLoc(WorkingSetMember* member) {
+    bool WorkingSetCommon::fetchAndInvalidateLoc(
+                WorkingSetMember* member, const Collection* collection) {
         // Already in our desired state.
         if (member->state == WorkingSetMember::OWNED_OBJ) { return true; }
 
@@ -41,7 +43,7 @@ namespace mongo {
         if (!member->hasLoc()) { return false; }
 
         // Do the fetch, invalidate the DL.
-        member->obj = member->loc.obj().getOwned();
+        member->obj = collection->docFor(member->loc).getOwned();
 
         member->state = WorkingSetMember::OWNED_OBJ;
         member->loc = DiskLoc();