--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/AnnotationsFactory.java	Thu Apr 14 13:11:12 2011 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/AnnotationsFactory.java	Thu Apr 14 13:15:16 2011 +0000
@@ -2,17 +2,13 @@
 
 import java.util.List;
 
-import de.intevation.flys.backend.SessionFactoryProvider;
-
 import de.intevation.flys.model.Annotation;
 import de.intevation.flys.model.Range;
 import de.intevation.flys.model.River;
 
-import org.hibernate.SessionFactory;
 import org.hibernate.Session;
 import org.hibernate.Query;
 
-
 /**
  * @author <a href="mailto:ingo.weinzierl@intevation.de">Ingo Weinzierl</a>
  */
@@ -24,23 +20,17 @@
 
 
     public static List<Annotation> getAnnotations(String river) {
-        SessionFactory sf = SessionFactoryProvider.getSessionFactory();
-        Session session   = sf.openSession();
+        Session session = SessionHolder.HOLDER.get();
 
-        try {
-            Query rangesQuery = session.createQuery(
-                "from Range where river.name=:name");
-            rangesQuery.setParameter("name", river);
-            List<Range> ranges = rangesQuery.list();
+        Query rangesQuery = session.createQuery(
+            "from Range where river.name=:name");
+        rangesQuery.setParameter("name", river);
+        List<Range> ranges = rangesQuery.list();
 
-            Query query = session.createQuery(
-                "from Annotation where range in (:ranges)");
-            query.setParameterList("ranges", ranges);
-            return query.list();
-        }
-        finally {
-            session.close();
-        }
+        Query query = session.createQuery(
+            "from Annotation where range in (:ranges)");
+        query.setParameterList("ranges", ranges);
+        return query.list();
     }
 }
 // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf-8 :