From 5e62675bae194ece869326daca34a05762e322b3 Mon Sep 17 00:00:00 2001 From: Oliver Gierke Date: Thu, 8 Mar 2012 13:14:03 +0100 Subject: [PATCH] DATAMONGO-412 - Fixed duplicate invocation of getUserCredentials(). --- .../config/AbstractMongoConfiguration.java | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/AbstractMongoConfiguration.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/AbstractMongoConfiguration.java index bdd9032e0..1b9dd4003 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/AbstractMongoConfiguration.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/AbstractMongoConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2011 the original author or authors. + * Copyright 2011-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,7 +18,6 @@ package org.springframework.data.mongodb.config; import java.util.HashSet; import java.util.Set; -import com.mongodb.Mongo; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ClassPathScanningCandidateComponentProvider; @@ -35,6 +34,14 @@ import org.springframework.data.mongodb.core.mapping.MongoMappingContext; import org.springframework.util.ClassUtils; import org.springframework.util.StringUtils; +import com.mongodb.Mongo; + +/** + * Abstract base class to ease JavaConfig setup for Spring Data MongoDB. + * + * @author Mark Pollack + * @author Oliver Gierke + */ @Configuration public abstract class AbstractMongoConfiguration { @@ -50,10 +57,11 @@ public abstract class AbstractMongoConfiguration { @Bean public MongoDbFactory mongoDbFactory() throws Exception { - if (getUserCredentials() == null) { + UserCredentials credentials = getUserCredentials(); + if (credentials == null) { return new SimpleMongoDbFactory(mongo(), getDatabaseName()); } else { - return new SimpleMongoDbFactory(mongo(), getDatabaseName(), getUserCredentials()); + return new SimpleMongoDbFactory(mongo(), getDatabaseName(), credentials); } }