Author: [log in to unmask]
Date: Fri Mar 6 22:23:09 2015
New Revision: 2325
Log:
Change ConditionsDriver so it will not override an existing conditions manager.
Modified:
java/trunk/conditions/src/main/java/org/hps/conditions/ConditionsDriver.java
Modified: java/trunk/conditions/src/main/java/org/hps/conditions/ConditionsDriver.java
=============================================================================
--- java/trunk/conditions/src/main/java/org/hps/conditions/ConditionsDriver.java (original)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/ConditionsDriver.java Fri Mar 6 22:23:09 2015
@@ -39,7 +39,6 @@
*/
public class ConditionsDriver extends Driver {
- DatabaseConditionsManager conditionsManager;
String detectorName = null;
String tag = null;
String xmlConfigResource = null;
@@ -50,7 +49,6 @@
* Default constructor.
*/
public ConditionsDriver() {
- conditionsManager = new DatabaseConditionsManager();
}
/**
@@ -107,6 +105,9 @@
* @throws RuntimeException If there is a problem setting up the conditions system.
*/
public void initialize() {
+
+ DatabaseConditionsManager conditionsManager = DatabaseConditionsManager.getInstance();
+
if (xmlConfigResource != null) {
// Set a custom XML configuration resource.
conditionsManager.setXmlConfig(xmlConfigResource);
|