Configuration: Allow the same configuration to be loaded multiple times.

git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@674 44740490-163a-0410-bde0-09ae8108e29a

lib/SimpleSAML/Configuration.php

@@ -33,10 +33,20 @@ class SimpleSAML_Configuration {
 	}
 	
 	public static function init($path, $instancename = 'simplesaml', $configfilename = 'config.php') {
+		/* Check if we already have loaded the given config - return the existing instance if we have. */
+		if(array_key_exists($instancename, self::$instance)) {
+			return self::$instance[$instancename];
+		}
+
 		self::$instance[$instancename] = new SimpleSAML_Configuration($path, $configfilename);
 	}
 	
 	public function copyFromBase($instancename, $filename) {
+		/* Check if we already have loaded the given config - return the existing instance if we have. */
+		if(array_key_exists($instancename, self::$instance)) {
+			return self::$instance[$instancename];
+		}
+
 		self::$instance[$instancename] = new SimpleSAML_Configuration($this->configpath, $filename);
 		return self::$instance[$instancename];
 	}