Bug 1256593 - remvoed dead code. r?sicking draft
authorBogdan Postelnicu <bogdan.postelnicu@softvision.ro>
Tue, 15 Mar 2016 13:44:42 +0200
changeset 340481 638926970280f0f948503735dc2e72b60676a6ee
parent 339874 f0c0480732d36153e8839c7f17394d45f679f87d
child 516196 37fc52845ba916b85d5bd3512457428c9148e6c3
push id12976
push userBogdan.Postelnicu@softvision.ro
push dateTue, 15 Mar 2016 11:46:30 +0000
reviewerssicking
bugs1256593
milestone48.0a1
Bug 1256593 - remvoed dead code. r?sicking MozReview-Commit-ID: CqeAV6I0Jme
dom/indexedDB/ActorsParent.cpp
--- a/dom/indexedDB/ActorsParent.cpp
+++ b/dom/indexedDB/ActorsParent.cpp
@@ -17790,28 +17790,22 @@ DatabaseMaintenance::CheckIntegrity(mozI
       MOZ_ASSERT(hasResult);
 
       rv = stmt->GetInt32(0, &foreignKeysWereEnabled);
       if (NS_WARN_IF(NS_FAILED(rv))) {
         return rv;
       }
     }
 
-    bool changedForeignKeys;
-    if (foreignKeysWereEnabled) {
-      changedForeignKeys = false;
-    } else {
+    if (!foreignKeysWereEnabled) {
       rv = aConnection->ExecuteSimpleSQL(NS_LITERAL_CSTRING(
-        "PRAGMA foreign_keys = ON;"
-      ));
-      if (NS_WARN_IF(NS_FAILED(rv))) {
-        return rv;
-      }
-
-      changedForeignKeys = true;
+        "PRAGMA foreign_keys = ON;"));
+      if (NS_WARN_IF(NS_FAILED(rv))) {
+        return rv;
+      }
     }
 
     bool foreignKeyError;
     {
       nsCOMPtr<mozIStorageStatement> stmt;
       rv = aConnection->CreateStatement(NS_LITERAL_CSTRING(
         "PRAGMA foreign_key_check;"
       ), getter_AddRefs(stmt));
@@ -17820,24 +17814,20 @@ DatabaseMaintenance::CheckIntegrity(mozI
       }
 
       rv = stmt->ExecuteStep(&foreignKeyError);
       if (NS_WARN_IF(NS_FAILED(rv))) {
         return rv;
       }
     }
 
-    if (changedForeignKeys) {
+    if (!foreignKeysWereEnabled) {
       nsAutoCString stmtSQL;
       stmtSQL.AssignLiteral("PRAGMA foreign_keys = ");
-      if (foreignKeysWereEnabled) {
-        stmtSQL.AppendLiteral("ON");
-      } else {
-        stmtSQL.AppendLiteral("OFF");
-      }
+      stmtSQL.AppendLiteral("OFF");
       stmtSQL.Append(';');
 
       rv = aConnection->ExecuteSimpleSQL(stmtSQL);
       if (NS_WARN_IF(NS_FAILED(rv))) {
         return rv;
       }
     }