Merge pull request #1312 from magento-engcom/develop-prs

Public Pull Requests #10199 #9955
magento · Jul 11, 2017 · 071c521 · 071c521
2 parents f215f3d + 2db8fea
commit 071c521
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute.php b/app/code/Magento/Eav/Model/Entity/Attribute.php
@@ -23,7 +23,7 @@ class Attribute extends \Magento\Eav\Model\Entity\Attribute\AbstractAttribute im
     /**
      * Attribute code max length
      */
-    const ATTRIBUTE_CODE_MAX_LENGTH = 30;
+    const ATTRIBUTE_CODE_MAX_LENGTH = 255;
 
     /**
      * Cache tag

diff --git a/lib/internal/Magento/Framework/Model/ResourceModel/AbstractResource.php b/lib/internal/Magento/Framework/Model/ResourceModel/AbstractResource.php
@@ -91,7 +91,7 @@ public function commit()
                     call_user_func($callback);
                 }
             } catch (\Exception $e) {
-                throw $e;
+                $this->logger->critical($e);
             }
         }
         return $this;