diff options
Diffstat (limited to 'java/src/Freeze/ConnectionI.java')
-rwxr-xr-x | java/src/Freeze/ConnectionI.java | 178 |
1 files changed, 89 insertions, 89 deletions
diff --git a/java/src/Freeze/ConnectionI.java b/java/src/Freeze/ConnectionI.java index 3b2136486c9..0c8f2eed788 100755 --- a/java/src/Freeze/ConnectionI.java +++ b/java/src/Freeze/ConnectionI.java @@ -15,103 +15,103 @@ class ConnectionI extends Ice.LocalObjectImpl implements Connection public Transaction beginTransaction() { - if(_transaction != null) - { - throw new Freeze.TransactionAlreadyInProgressException(); - } - closeAllIterators(); - _transaction = new TransactionI(this); - return _transaction; + if(_transaction != null) + { + throw new Freeze.TransactionAlreadyInProgressException(); + } + closeAllIterators(); + _transaction = new TransactionI(this); + return _transaction; } public Transaction currentTransaction() { - return _transaction; + return _transaction; } public void close() { - close(false); + close(false); } public Ice.Communicator getCommunicator() { - return _communicator; + return _communicator; } public String getName() { - return _envName; + return _envName; } protected void finalize() { - close(true); + close(true); } void close(boolean finalizing) { - if(_transaction != null) - { - if(finalizing) - { - _communicator.getLogger().warning - ("Finalizing Connection on DbEnv \"" + _envName + "\" with active transaction"); - } - - try - { - _transaction.rollback(); - } - catch(Freeze.DatabaseException dx) - { - // - // Ignored - // - } - } - - - synchronized(this) - { - java.util.Iterator p = _mapList.iterator(); - while(p.hasNext()) - { - ((Map) p.next()).close(finalizing); - } - } - - - if(_dbEnv != null) - { - try - { - _dbEnv.close(); - } - finally - { - _dbEnv = null; - } - } + if(_transaction != null) + { + if(finalizing) + { + _communicator.getLogger().warning + ("Finalizing Connection on DbEnv \"" + _envName + "\" with active transaction"); + } + + try + { + _transaction.rollback(); + } + catch(Freeze.DatabaseException dx) + { + // + // Ignored + // + } + } + + + synchronized(this) + { + java.util.Iterator p = _mapList.iterator(); + while(p.hasNext()) + { + ((Map) p.next()).close(finalizing); + } + } + + + if(_dbEnv != null) + { + try + { + _dbEnv.close(); + } + finally + { + _dbEnv = null; + } + } } ConnectionI(Ice.Communicator communicator, String envName, com.sleepycat.db.Environment dbEnv) { - _communicator = communicator; - _dbEnv = SharedDbEnv.get(communicator, envName, dbEnv); - _envName = envName; - _trace = _communicator.getProperties().getPropertyAsInt("Freeze.Trace.Map"); - _txTrace = _communicator.getProperties().getPropertyAsInt("Freeze.Trace.Transaction"); - - Ice.Properties properties = _communicator.getProperties(); - _deadlockWarning = properties.getPropertyAsInt("Freeze.Warn.Deadlocks") > 0; - _closeInFinalizeWarning = properties.getPropertyAsIntWithDefault("Freeze.Warn.CloseInFinalize", 1) > 0; + _communicator = communicator; + _dbEnv = SharedDbEnv.get(communicator, envName, dbEnv); + _envName = envName; + _trace = _communicator.getProperties().getPropertyAsInt("Freeze.Trace.Map"); + _txTrace = _communicator.getProperties().getPropertyAsInt("Freeze.Trace.Transaction"); + + Ice.Properties properties = _communicator.getProperties(); + _deadlockWarning = properties.getPropertyAsInt("Freeze.Warn.Deadlocks") > 0; + _closeInFinalizeWarning = properties.getPropertyAsIntWithDefault("Freeze.Warn.CloseInFinalize", 1) > 0; } // @@ -121,87 +121,87 @@ class ConnectionI extends Ice.LocalObjectImpl implements Connection synchronized void closeAllIterators() { - java.util.Iterator p = _mapList.iterator(); - while(p.hasNext()) - { - ((Map) p.next()).closeAllIterators(); - } + java.util.Iterator p = _mapList.iterator(); + while(p.hasNext()) + { + ((Map) p.next()).closeAllIterators(); + } } synchronized java.util.Iterator registerMap(Map map) { - _mapList.addFirst(map); - java.util.Iterator p = _mapList.iterator(); - p.next(); - return p; + _mapList.addFirst(map); + java.util.Iterator p = _mapList.iterator(); + p.next(); + return p; } synchronized void unregisterMap(java.util.Iterator p) { - p.remove(); + p.remove(); } void clearTransaction() { - _transaction = null; + _transaction = null; } com.sleepycat.db.Transaction dbTxn() { - if(_transaction == null) - { - return null; - } - else - { - return _transaction.dbTxn(); - } + if(_transaction == null) + { + return null; + } + else + { + return _transaction.dbTxn(); + } } SharedDbEnv dbEnv() { - return _dbEnv; + return _dbEnv; } String envName() { - return _envName; + return _envName; } Ice.Communicator communicator() { - return _communicator; + return _communicator; } final int trace() { - return _trace; + return _trace; } final int txTrace() { - return _txTrace; + return _txTrace; } final boolean deadlockWarning() { - return _deadlockWarning; + return _deadlockWarning; } final boolean closeInFinalizeWarning() { - return _closeInFinalizeWarning; + return _closeInFinalizeWarning; } private Ice.Communicator _communicator; |