Author: tv
Date: Wed Oct 23 11:44:42 2019
New Revision: 1868796
URL: http://svn.apache.org/viewvc?rev=1868796&view=rev
Log:
Fix initalization sequence. isInit=true is required by startIdBrokers()
Modified:
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/TorqueInstance.java
Modified:
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/TorqueInstance.java
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/TorqueInstance.java?rev=1868796&r1=1868795&r2=1868796&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/TorqueInstance.java
(original)
+++
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/TorqueInstance.java
Wed Oct 23 11:44:42 2019
@@ -203,9 +203,10 @@ public class TorqueInstance
// setup manager mappings
initManagerMappings(conf);
- startIdBrokers();
isInit = true;
+
+ startIdBrokers();
}
@@ -597,10 +598,10 @@ public class TorqueInstance
{
log.debug("init(" + configFile + ")");
try
- {
+ {
Configuration configuration;
if (!configFile.endsWith("xml")) {
-
+
FileBasedConfigurationBuilder<PropertiesConfiguration>
propertiesBuilder = new FileBasedConfigurationBuilder<>(
PropertiesConfiguration.class)
.configure(
@@ -620,7 +621,7 @@ public class TorqueInstance
}
log.debug("Config Object is " + configuration);
-
+
init(configuration);
}
catch (ConfigurationException e)
@@ -863,7 +864,7 @@ public class TorqueInstance
/**
* This method returns a PeerImpl for the given class.
- *
+ *
* @param <T> the type of the OM class
* @param <P> the type of the peerInstance class
* @param omClass the class of the associated OM object
@@ -1246,7 +1247,7 @@ public class TorqueInstance
* The key of the Map is the name of the database, and the value is the
* database instance.
* </p>
- *
+ *
* <p>
* Note that in the very special case where a new database which
* is not configured in Torque's configuration gets known to Torque
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
