Author: [log in to unmask]
Date: Sun Nov 2 19:42:45 2014
New Revision: 1418
Log:
If an existing conditions manager exist, don't instantiate a new one.
Modified:
java/branches/hps_java_trunk_HPSJAVA-255/conditions/src/main/java/org/hps/conditions/TestRunConditionsDriver.java
Modified: java/branches/hps_java_trunk_HPSJAVA-255/conditions/src/main/java/org/hps/conditions/TestRunConditionsDriver.java
=============================================================================
--- java/branches/hps_java_trunk_HPSJAVA-255/conditions/src/main/java/org/hps/conditions/TestRunConditionsDriver.java (original)
+++ java/branches/hps_java_trunk_HPSJAVA-255/conditions/src/main/java/org/hps/conditions/TestRunConditionsDriver.java Sun Nov 2 19:42:45 2014
@@ -1,5 +1,6 @@
package org.hps.conditions;
+import org.lcsim.conditions.ConditionsManager;
import org.lcsim.geometry.Detector;
import org.hps.conditions.svt.TestRunSvtConditions;
@@ -25,10 +26,15 @@
// Default constructor used to setup the database connection
public TestRunConditionsDriver(){
- manager = new DatabaseConditionsManager();
- manager.setConnectionResource(TEST_RUN_CONNECTION);
- manager.configure(TEST_RUN_CONFIG);
- manager.register();
+ if (ConditionsManager.defaultInstance() instanceof DatabaseConditionsManager) {
+ System.out.println(this.getName()+": Found existing DatabaseConditionsManager");
+ manager = (DatabaseConditionsManager) ConditionsManager.defaultInstance();
+ } else {
+ manager = new DatabaseConditionsManager();
+ manager.setConnectionResource(TEST_RUN_CONNECTION);
+ manager.configure(TEST_RUN_CONFIG);
+ manager.register();
+ }
}
/**
|