#1167 - do not connect to write adapter when getting the read adapter (…

…#1169) * #1167 - do not connect to write adapter when getting the read adapter * #1167 - accidentally changed the return signature for _getReadAdapter()
OpenMage · May 16, 2021 · 9d0cb18 · 9d0cb18
1 parent e055833
commit 9d0cb18
Showing 1 changed file with 16 additions and 4 deletions.
diff --git a/app/code/core/Mage/Core/Model/Resource/Db/Abstract.php b/app/code/core/Mage/Core/Model/Resource/Db/Abstract.php
@@ -324,18 +324,30 @@ protected function _getConnection($connectionName)
         return $this->_connections[$connectionName];
     }
 
+    /**
+     * @param string $connectionName
+     * @return bool
+     */
+    public function hasConnection($connectionName)
+    {
+        return isset($this->_connections[$connectionName]);
+    }
+
     /**
      * Retrieve connection for read data
      *
      * @return Magento_Db_Adapter_Pdo_Mysql
      */
     protected function _getReadAdapter()
     {
-        $writeAdapter = $this->_getWriteAdapter();
-        if ($writeAdapter && $writeAdapter->getTransactionLevel() > 0) {
-            // if transaction is started we should use write connection for reading
-            return $writeAdapter;
+        if ($this->hasConnection('write')) {
+            $writeAdapter = $this->_getWriteAdapter();
+            if ($writeAdapter && $writeAdapter->getTransactionLevel() > 0) {
+                // if transaction is started we should use write connection for reading
+                return $writeAdapter;
+            }
         }
+
         return $this->_getConnection('read');
     }