Merge branch 'master' of https://github.com/roded/mongobee into roded-master

lstolowski · lstolowski · commit abf507930c55 · 2016-09-07T16:01:36.000+02:00
# Conflicts:
#	src/main/java/com/github/mongobee/Mongobee.java
#	src/main/java/com/github/mongobee/dao/ChangeEntryDao.java
diff --git a/src/main/java/com/github/mongobee/Mongobee.java b/src/main/java/com/github/mongobee/Mongobee.java
@@ -328,4 +328,12 @@ public Mongobee setJongo(Jongo jongo) {
     return this;
   }
 
+
+  /**
+   * Closes the Mongo instance used by Mongobee.
+   * This will close either the connection Mongobee was initiated with or that which was internally created.
+   */
+  public void close() {
+     dao.close();
+  }
 }
diff --git a/src/main/java/com/github/mongobee/dao/ChangeEntryDao.java b/src/main/java/com/github/mongobee/dao/ChangeEntryDao.java
@@ -27,6 +27,7 @@ public class ChangeEntryDao {
   private static final Logger logger = LoggerFactory.getLogger("Mongobee dao");
 
   private DB db;
+  private Mongo mongo;
   private ChangeEntryIndexDao indexDao = new ChangeEntryIndexDao();
 
   private LockDao lockDao = new LockDao();
@@ -39,6 +40,7 @@ public DB connectMongoDb(Mongo mongo, String dbName) throws MongobeeConfiguratio
     if (!hasText(dbName)) {
       throw new MongobeeConfigurationException("DB name is not set. Should be defined in MongoDB URI or via setter");
     } else {
+      this.mongo = mongo;
       db = mongo.getDB(dbName);
       ensureChangeLogCollectionIndex(db.getCollection(CHANGELOG_COLLECTION));
       initializeLock();
@@ -114,6 +116,10 @@ private void ensureChangeLogCollectionIndex(DBCollection collection) {
 
   }
 
+  public void close() {
+      this.mongo.close();
+  }
+
   private void initializeLock() {
     lockDao.intitializeLock(db);
   }

Original file line number	Diff line number	Diff line change
`@@ -328,4 +328,12 @@ public Mongobee setJongo(Jongo jongo) {`
`328`	`328`	`return this;`
`329`	`329`	`}`
`330`	`330`
	`331`	`+`
	`332`	`+ /**`
	`333`	`+ * Closes the Mongo instance used by Mongobee.`
	`334`	`+ * This will close either the connection Mongobee was initiated with or that which was internally created.`
	`335`	`+ */`
	`336`	`+ public void close() {`
	`337`	`+ dao.close();`
	`338`	`+ }`
`331`	`339`	`}`