Mercurial > dive4elements > river

diff backend/src/main/java/org/dive4elements/river/model/sinfo/CollisionType.java @ 9578:3dfcb6e1c4d6
Use of SessionHolder replaced by ImporterSession if query executed in the importer
author: mschaefer
date: Tue, 11 Dec 2018 14:40:36 +0100
parents: 50416a0df385
--- a/backend/src/main/java/org/dive4elements/river/model/sinfo/CollisionType.java	Tue Nov 13 13:02:00 2018 +0100
+++ b/backend/src/main/java/org/dive4elements/river/model/sinfo/CollisionType.java	Tue Dec 11 14:40:36 2018 +0100
@@ -74,8 +74,10 @@
     /**
      * Queries all collision types from the database, orders by name
      */
-    public static List<CollisionType> getTypes() {
-        final Session session = SessionHolder.HOLDER.get();
+    public static List<CollisionType> getTypes(final Session session) {
+        Session session1 = session;
+        if (session1 == null)
+            session1 = SessionHolder.HOLDER.get();
         final Query query = session.createQuery("FROM CollisionType ORDER BY name");
         return new ArrayList<>(query.list());
     }