1 files changed, 4 insertions, 3 deletions
diff --git a/includes/database/database.inc b/includes/database/database.inc
index 6b878d99f..d2a633d5a 100644
--- a/includes/database/database.inc
+++ b/includes/database/database.inc
@@ -878,6 +878,9 @@ abstract class DatabaseConnection extends PDO {
    * @see DatabaseTransaction::rollback()
    */
   public function rollback($savepoint_name = 'drupal_transaction') {
+    if (!$this->supportsTransactions()) {
+      return;
+    }
     if (!$this->inTransaction()) {
       throw new DatabaseTransactionNoActiveException();
     }
@@ -901,9 +904,7 @@ abstract class DatabaseConnection extends PDO {
         return;
       }
     }
-    if ($this->supportsTransactions()) {
-      parent::rollBack();
-    }
+    parent::rollBack();
   }
 
   /**