Minor refactured

[core.git] / inc / classes / main / factories / objects / class_ObjectFactory.php

diff --git a/inc/classes/main/factories/objects/class_ObjectFactory.php b/inc/classes/main/factories/objects/class_ObjectFactory.php
index 7fe995509e3043368c476c95dd2bc0c1abfc21a4..71b7b93909bc9d421fc3865cc638637830549d59 100644 (file)
--- a/inc/classes/main/factories/objects/class_ObjectFactory.php
+++ b/inc/classes/main/factories/objects/class_ObjectFactory.php
@@ -49,17 +49,14 @@ class ObjectFactory extends BaseFactory {
         * @throws      EmptyVariableException  If a variable is empty unexpectly
         */
        public final static function createObjectByName ($className, array $args=array()) {
+               // First get an instance of this factory
+               $factoryInstance = new ObjectFactory();
+
                // Is the class name valid and is the class there?
                if (empty($className)) {
-                       // First get an instance of this factory
-                       $factoryInstance = new ObjectFactory();
-
                        // Throw an exception here
                        throw new EmptyVariableException(array($factoryInstance, 'className'), self::EXCEPTION_UNEXPECTED_EMPTY_STRING);
                } elseif (!class_exists($className)) {
-                       // First get an instance of this factory
-                       $factoryInstance = new ObjectFactory();
-
                        // Then throw an exception
                        throw new ClassNotFoundException(array($factoryInstance, $className), self::EXCEPTION_CLASS_NOT_FOUND);
                }