Mercurial > dive4elements > river
comparison flys-artifacts/src/main/java/de/intevation/flys/artifacts/AnnotationArtifact.java @ 1631:26e19cdaed5e
Improved database session handling in services and artifacts.
flys-artifacts/trunk@2807 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author | Ingo Weinzierl <ingo.weinzierl@intevation.de> |
---|---|
date | Thu, 22 Sep 2011 10:07:22 +0000 |
parents | 238145ef67da |
children | 19d0eb41e923 |
comparison
equal
deleted
inserted
replaced
1630:cafd8af6734a | 1631:26e19cdaed5e |
---|---|
5 | 5 |
6 import org.w3c.dom.Document; | 6 import org.w3c.dom.Document; |
7 import org.w3c.dom.Element; | 7 import org.w3c.dom.Element; |
8 | 8 |
9 import org.apache.log4j.Logger; | 9 import org.apache.log4j.Logger; |
10 | |
11 import org.hibernate.Session; | |
12 | 10 |
13 //import net.sf.ehcache.Cache; | 11 //import net.sf.ehcache.Cache; |
14 | 12 |
15 import de.intevation.artifacts.Artifact; | 13 import de.intevation.artifacts.Artifact; |
16 import de.intevation.artifacts.ArtifactNamespaceContext; | 14 import de.intevation.artifacts.ArtifactNamespaceContext; |
27 | 25 |
28 import de.intevation.flys.artifacts.states.DefaultState; | 26 import de.intevation.flys.artifacts.states.DefaultState; |
29 import de.intevation.flys.artifacts.cache.CacheFactory; | 27 import de.intevation.flys.artifacts.cache.CacheFactory; |
30 import de.intevation.flys.artifacts.context.FLYSContext; | 28 import de.intevation.flys.artifacts.context.FLYSContext; |
31 import de.intevation.flys.artifacts.model.AnnotationsFactory; | 29 import de.intevation.flys.artifacts.model.AnnotationsFactory; |
32 | |
33 import de.intevation.flys.backend.SessionHolder; | |
34 | 30 |
35 import de.intevation.flys.model.Annotation; | 31 import de.intevation.flys.model.Annotation; |
36 | 32 |
37 import de.intevation.flys.utils.FLYSUtils; | 33 import de.intevation.flys.utils.FLYSUtils; |
38 | 34 |
244 * @return List of Annotations fetched fresh from session/database. | 240 * @return List of Annotations fetched fresh from session/database. |
245 * @see DistanceInfoService to access cached documents. | 241 * @see DistanceInfoService to access cached documents. |
246 */ | 242 */ |
247 protected List<Annotation> getAnnotationsUncached(String river) { | 243 protected List<Annotation> getAnnotationsUncached(String river) { |
248 List<Annotation> annotations = new ArrayList<Annotation>(); | 244 List<Annotation> annotations = new ArrayList<Annotation>(); |
249 Session session = SessionHolder.acquire(); | 245 annotations = AnnotationsFactory.getPointAnnotations(river); |
250 try { | 246 |
251 annotations = AnnotationsFactory.getPointAnnotations(river); | |
252 } finally {session.close(); SessionHolder.release();} | |
253 return annotations; | 247 return annotations; |
254 } | 248 } |
255 } | 249 } |
256 // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : | 250 // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : |