Mercurial > dive4elements > river
comparison 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 |
| children |
comparison
equal
deleted
inserted
replaced
| 9577:ca19b7186294 | 9578:3dfcb6e1c4d6 |
|---|---|
| 72 } | 72 } |
| 73 | 73 |
| 74 /** | 74 /** |
| 75 * Queries all collision types from the database, orders by name | 75 * Queries all collision types from the database, orders by name |
| 76 */ | 76 */ |
| 77 public static List<CollisionType> getTypes() { | 77 public static List<CollisionType> getTypes(final Session session) { |
| 78 final Session session = SessionHolder.HOLDER.get(); | 78 Session session1 = session; |
| 79 if (session1 == null) | |
| 80 session1 = SessionHolder.HOLDER.get(); | |
| 79 final Query query = session.createQuery("FROM CollisionType ORDER BY name"); | 81 final Query query = session.createQuery("FROM CollisionType ORDER BY name"); |
| 80 return new ArrayList<>(query.list()); | 82 return new ArrayList<>(query.list()); |
| 81 } | 83 } |
| 82 } | 84 } |