SERVER-7511: fix backport for 2.2

2 files changed, 5 insertions, 4 deletions

diff --git a/src/mongo/db/ops/update_internal.cpp b/src/mongo/db/ops/update_internal.cpp
index 3d63bd61270..e91d56b3f08 100644
--- a/src/mongo/db/ops/update_internal.cpp
+++ b/src/mongo/db/ops/update_internal.cpp
@@ -1113,7 +1113,7 @@ namespace mongo {
             updateIsIndexed( i->second, idxKeys , backgroundKeys );
     }
 
-    bool getCanonicalIndexField( const StringData& fullName, string* out ) {
+    bool getCanonicalIndexField( const string& fullName, string* out ) {
         // check if fieldName contains ".$" or ".###" substrings (#=digit) and skip them
         if ( fullName.find( '.' ) == string::npos )
             return false;
diff --git a/src/mongo/db/ops/update_internal.h b/src/mongo/db/ops/update_internal.h
index 6b09e0dc37b..b486cadefb9 100644
--- a/src/mongo/db/ops/update_internal.h
+++ b/src/mongo/db/ops/update_internal.h
@@ -34,7 +34,7 @@ namespace mongo {
      * a.$ -> a
      * @return true if out is set and we made a change
      */
-    bool getCanonicalIndexField( const StringData& fullName, string* out );
+    bool getCanonicalIndexField( const string& fullName, string* out );
 
     /* Used for modifiers such as $inc, $set, $push, ...
      * stores the info about a single operation
@@ -165,13 +165,14 @@ namespace mongo {
          * @return true iff the mod is indexed
          */
         bool isIndexed( const set<string>& idxKeys ) const {
+            string myFieldName = fieldName;
 
             // first, check if full name is in idxKeys
-            if ( isIndexed( fieldName , idxKeys ) )
+            if ( isIndexed( myFieldName , idxKeys ) )
                 return true;
 
             string x;
-            if ( getCanonicalIndexField( fieldName, &x ) ) {
+            if ( getCanonicalIndexField( myFieldName, &x ) ) {
                 if ( isIndexed( x, idxKeys ) )
                     return true;
             }