Spring/spring-data-mongodb
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

allow configuration of host and port when MongoOptions exists

Browse Source
This commit is contained in:
Graeme Rocher
2010-11-10 13:57:10 +01:00
parent ede9c6ed8b
commit cf04bf7d7a
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/bean/factory/MongoFactoryBean.java
View File

@@ -25,6 +25,7 @@ import org.springframework.util.Assert;
import com.mongodb.Mongo;
import com.mongodb.MongoOptions;
import com.mongodb.ServerAddress;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -51,10 +52,6 @@ public class MongoFactoryBean implements FactoryBean<Mongo>, InitializingBean,
private String host;
private Integer port;
public void setMongo(Mongo mongo) {
this.mongo = mongo;
}
public void setMongoOptions(MongoOptions mongoOptions) {
this.mongoOptions = mongoOptions;
}
@@ -91,7 +88,13 @@ public class MongoFactoryBean implements FactoryBean<Mongo>, InitializingBean,
}
else {
if(mongoOptions != null) {
mongo = new Mongo(host != null ? host : "localhost", mongoOptions);
String mongoHost = host != null ? host : "localhost";
if(port != null) {
mongo = new Mongo(new ServerAddress(mongoHost, port), mongoOptions);
}
else {
mongo = new Mongo(mongoHost, mongoOptions);
}
}
else if (port == null) {
mongo = new Mongo(host);