From: Vásáry Dániel Date: Wed, 4 Jul 2018 13:47:05 +0000 (+0000) Subject: git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube... X-Git-Url: http://git.useribm.hu/?a=commitdiff_plain;h=1d7f95b40c626bcdd28b151af58c509587a970f0;p=mediacube.git git-tfs-id: [tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C31147 --- diff --git a/server/user.jobengine.osgi.server/test/user/jobengine/server/IT/Support.java b/server/user.jobengine.osgi.server/test/user/jobengine/server/IT/Support.java index f040151a..1240c31b 100644 --- a/server/user.jobengine.osgi.server/test/user/jobengine/server/IT/Support.java +++ b/server/user.jobengine.osgi.server/test/user/jobengine/server/IT/Support.java @@ -292,10 +292,14 @@ public class Support { } if (ids == null) return null; - DBCollection rundownCollection = NoSQLUtils.collection(referenceCollectionName); + + DB db = NoSQLUtils.getNoSQLDB(); + DBCollection collection = db.getCollection(referenceCollectionName); BasicDBObject query = (BasicDBObject) QueryBuilder.start().put(IOctopusAPI.ID).in(ids).get(); - DBCursor cursor = rundownCollection.find(query); - return NoSQLUtils.asList(cursor); + DBCursor cursor = collection.find(query); + List result = NoSQLUtils.asList(cursor); + db.cancelBatch(); + return result; } private Item getRundownItem(BasicDBObject rundown) { @@ -332,11 +336,13 @@ public class Support { } public List getRundownsByPlaceHolderID(String id) { - DBCollection storyCollection = NoSQLUtils.collection(IOctopusAPI.STORY_COLLECTION); + DB db = NoSQLUtils.getNoSQLDB(); + DBCollection collection = db.getCollection(IOctopusAPI.STORY_COLLECTION); BasicDBObject criteria = new BasicDBObject(IOctopusAPI.MOS_OBJECTS, new BasicDBObject(IOctopusAPI.$ELEMMATCH, new BasicDBObject(IOctopusAPI.OBJ_ID, id))); - DBCursor find = storyCollection.find(criteria, new BasicDBObject(IOctopusAPI.REF_RUNDOWN, 1)); + DBCursor find = collection.find(criteria, new BasicDBObject(IOctopusAPI.REF_RUNDOWN, 1)); List rundowns = NoSQLUtils.asList(find); + db.cancelBatch(); return getReferencedObjects(rundowns, IOctopusAPI.RUNDOWN_COLLECTION, IOctopusAPI.REF_RUNDOWN); }