X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=framework%2Fmain%2Fclasses%2Fregistry%2Fgeneric%2Fclass_GenericRegistry.php;h=f5ce8237c4882baaedd9248257f02d551b2382c1;hb=0ea73fee55f5e2a522415cdeb32c8d3ffa75abc3;hp=5c2b3a010c5b87180c1ed3ffaac369923b869c5d;hpb=73c0372c1dfd123b7b646ef359af1cd98c130ae7;p=core.git

diff --git a/framework/main/classes/registry/generic/class_GenericRegistry.php b/framework/main/classes/registry/generic/class_GenericRegistry.php
index 5c2b3a01..f5ce8237 100644
--- a/framework/main/classes/registry/generic/class_GenericRegistry.php
+++ b/framework/main/classes/registry/generic/class_GenericRegistry.php
@@ -2,6 +2,9 @@
 // Own namespace
 namespace Org\Mxchange\CoreFramework\Registry;
 
+// Import framework stuff
+use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
+
 /**
  * A registry for several data types and objects. Objects should be added by
  * addInstance() and therefore must implement the interface Registerable.
@@ -54,12 +57,12 @@ class GenericRegistry extends BaseRegistry implements Register {
 		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->traceMessage(sprintf('OBJECT-REGISTRY: key=%s - CALLED!', $key));
 		if (empty($key)) {
 			// Throw IAE
-			throw new InvalidArgumentException('Parameter "key" is empty');
+			throw new InvalidArgumentException('Parameter "key" is empty', FrameworkInterface::EXCEPTION_INVALID_ARGUMENT);
 		}
 
 		// Is an instance there?
-		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugMessage(sprintf('OBJECT-REGISTRY: self::registryInstance[%s][]=%s', $key, gettype(self::$registryInstances[$key])));
-		if (is_null(self::$registryInstances[$key])) {
+		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugMessage(sprintf('OBJECT-REGISTRY: self::registryInstance[%s]?=%d', $key, intval(isset((self::$registryInstances[$key])))));
+		if (!isset(self::$registryInstances[$key])) {
 			// Not yet, so create one
 			self::$registryInstances[$key] = new ObjectRegistry();
 		}