mindol1004/spring-data-mongodb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Renamed DBHolder to DbHolder and reduced its scope to package visibility.

Browse Source
This commit is contained in:
Oliver Gierke
2011-01-04 17:34:12 +01:00
parent fe68229fbd
commit 67cb890644
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/DBHolder.java → spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/DbHolder.java
View File

@@ -8,17 +8,17 @@ import org.springframework.util.Assert;
import com.mongodb.DB;
public class DBHolder extends ResourceHolderSupport {
class DbHolder extends ResourceHolderSupport {
private static final Object DEFAULT_KEY = new Object();
private final Map<Object, DB> dbMap = new ConcurrentHashMap<Object, DB>();
public DBHolder(DB db) {
public DbHolder(DB db) {
addDB(db);
}
public DBHolder(Object key, DB db) {
public DbHolder(Object key, DB db) {
addDB(key, db);
}

10
spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoDbUtils.java
View File

@@ -74,7 +74,7 @@ abstract class MongoDbUtils {
public static DB doGetDB(Mongo mongo, String databaseName, String username, char[] password, boolean allowCreate) {
Assert.notNull(mongo, "No Mongo instance specified");
DBHolder dbHolder = (DBHolder) TransactionSynchronizationManager.getResource(mongo);
DbHolder dbHolder = (DbHolder) TransactionSynchronizationManager.getResource(mongo);
if (dbHolder != null && !dbHolder.isEmpty()) {
// pre-bound Mongo DB
DB db = null;
@@ -106,9 +106,9 @@ abstract class MongoDbUtils {
if (TransactionSynchronizationManager.isSynchronizationActive()) {
// We're within a Spring-managed transaction, possibly from JtaTransactionManager.
LOGGER.debug("Registering Spring transaction synchronization for new Hibernate Session");
DBHolder holderToUse = dbHolder;
DbHolder holderToUse = dbHolder;
if (holderToUse == null) {
holderToUse = new DBHolder(db);
holderToUse = new DbHolder(db);
}
else {
holderToUse.addDB(db);
@@ -142,8 +142,8 @@ abstract class MongoDbUtils {
if (mongo == null) {
return false;
}
DBHolder dbHolder =
(DBHolder) TransactionSynchronizationManager.getResource(mongo);
DbHolder dbHolder =
(DbHolder) TransactionSynchronizationManager.getResource(mongo);
return (dbHolder != null && dbHolder.containsDB(db));
}