Author: tv Date: Thu Nov 17 16:10:53 2016 New Revision: 1770235 URL: http://svn.apache.org/viewvc?rev=1770235&view=rev Log: TORQUE-347 Reduce synchronization
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=1770235&r1=1770234&r2=1770235&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 Thu Nov 17 16:10:53 2016 @@ -120,7 +120,7 @@ public class TorqueInstance /** * Check if this TorqueInstance has been initialized. - * + * * @throws TorqueException if instance is not initialized */ private void checkInit() throws TorqueException @@ -130,7 +130,7 @@ public class TorqueInstance throw new TorqueException("Torque is not initialized."); } } - + /** * Initializes this instance of Torque. * @@ -683,7 +683,7 @@ public class TorqueInstance * @throws TorqueException Any exceptions caught during processing will be * rethrown wrapped into a TorqueException. */ - private synchronized void initManager(final String name, final String className) + private void initManager(final String name, final String className) throws TorqueException { AbstractBaseManager<?> manager = managers.get(name); @@ -1093,7 +1093,7 @@ public class TorqueInstance throws TorqueException { checkInit(); - + try { return getDataSourceFactory(name) @@ -1118,7 +1118,7 @@ public class TorqueInstance public Adapter getAdapter(final String name) throws TorqueException { checkInit(); - + Database database = getDatabase(name); if (database == null) { @@ -1233,7 +1233,7 @@ public class TorqueInstance public Map<String, Database> getDatabases() throws TorqueException { checkInit(); - + return Collections.unmodifiableMap(databases); } @@ -1255,7 +1255,7 @@ public class TorqueInstance { throw new NullPointerException("databaseName is null"); } - + Database result = databases.get(databaseName); if (result == null) { @@ -1266,7 +1266,7 @@ public class TorqueInstance result = newDatabase; } } - + return result; } } --------------------------------------------------------------------- To unsubscribe, e-mail: torque-dev-unsubscr...@db.apache.org For additional commands, e-mail: torque-dev-h...@db.apache.org