git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube...

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 f040151a9f83565b658a9abbc28a0d7327c81ae7..1240c31b8b6ffe04bab2ce357e05c14a4234848d 100644 (file)
--- 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 {
                }\r
                if (ids == null)\r
                        return null;\r
-               DBCollection rundownCollection = NoSQLUtils.collection(referenceCollectionName);\r
+\r
+               DB db = NoSQLUtils.getNoSQLDB();\r
+               DBCollection collection = db.getCollection(referenceCollectionName);\r
                BasicDBObject query = (BasicDBObject) QueryBuilder.start().put(IOctopusAPI.ID).in(ids).get();\r
-               DBCursor cursor = rundownCollection.find(query);\r
-               return NoSQLUtils.asList(cursor);\r
+               DBCursor cursor = collection.find(query);\r
+               List<DBObject> result = NoSQLUtils.asList(cursor);\r
+               db.cancelBatch();\r
+               return result;\r
        }\r
 \r
        private Item getRundownItem(BasicDBObject rundown) {\r
@@ -332,11 +336,13 @@ public class Support {
        }\r
 \r
        public List<DBObject> getRundownsByPlaceHolderID(String id) {\r
-               DBCollection storyCollection = NoSQLUtils.collection(IOctopusAPI.STORY_COLLECTION);\r
+               DB db = NoSQLUtils.getNoSQLDB();\r
+               DBCollection collection = db.getCollection(IOctopusAPI.STORY_COLLECTION);\r
                BasicDBObject criteria = new BasicDBObject(IOctopusAPI.MOS_OBJECTS,\r
                                new BasicDBObject(IOctopusAPI.$ELEMMATCH, new BasicDBObject(IOctopusAPI.OBJ_ID, id)));\r
-               DBCursor find = storyCollection.find(criteria, new BasicDBObject(IOctopusAPI.REF_RUNDOWN, 1));\r
+               DBCursor find = collection.find(criteria, new BasicDBObject(IOctopusAPI.REF_RUNDOWN, 1));\r
                List<DBObject> rundowns = NoSQLUtils.asList(find);\r
+               db.cancelBatch();\r
                return getReferencedObjects(rundowns, IOctopusAPI.RUNDOWN_COLLECTION, IOctopusAPI.REF_RUNDOWN);\r
        }\r
 \r