--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/services/DistanceInfoService.java	Thu Sep 22 07:58:24 2011 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/services/DistanceInfoService.java	Thu Sep 22 10:07:22 2011 +0000
@@ -14,9 +14,6 @@
 import de.intevation.artifacts.common.ArtifactNamespaceContext;
 import de.intevation.artifacts.common.utils.XMLUtils;
 
-import de.intevation.artifactdatabase.DefaultService;
-
-import de.intevation.flys.backend.SessionHolder;
 import de.intevation.flys.model.Annotation;
 import de.intevation.flys.model.Attribute;
 import de.intevation.flys.model.Position;
@@ -25,8 +22,6 @@
 
 import de.intevation.flys.artifacts.model.AnnotationsFactory;
 
-import org.hibernate.Session;
-
 import de.intevation.flys.artifacts.cache.CacheFactory;
 
 import net.sf.ehcache.Cache;
@@ -36,7 +31,7 @@
  *
  * @author <a href="mailto:ingo.weinzierl@intevation.de">Ingo Weinzierl</a>
  */
-public class DistanceInfoService extends DefaultService {
+public class DistanceInfoService extends FLYSService {
 
     private static enum DistanceFilter {
         NONE, LOCATIONS, DISTANCES
@@ -60,7 +55,7 @@
 
 
     @Override
-    public Document process(
+    public Document doProcess(
         Document      data,
         GlobalContext globalContext,
         CallMeta      callMeta
@@ -120,31 +115,23 @@
 
         Document result = XMLUtils.newDocument();
 
-        Session session = SessionHolder.acquire();
-
-        try {
-            Iterator<Annotation> iter =
-                AnnotationsFactory.getAnnotationsIterator(river);
-
-            Element all = result.createElement("distances");
-
-            DistanceFilter filter = getDistanceFilter(filtertype);
+        Iterator<Annotation> iter =
+            AnnotationsFactory.getAnnotationsIterator(river);
 
-            while (iter.hasNext()) {
-                Annotation a = iter.next();
-                Element distance = buildDistanceNode(result, a, filter);
+        Element all = result.createElement("distances");
 
-                if (distance != null) {
-                    all.appendChild(distance);
-                }
-            }
+        DistanceFilter filter = getDistanceFilter(filtertype);
 
-            result.appendChild(all);
+        while (iter.hasNext()) {
+            Annotation a = iter.next();
+            Element distance = buildDistanceNode(result, a, filter);
+
+            if (distance != null) {
+                all.appendChild(distance);
+            }
         }
-        finally {
-            session.close();
-            SessionHolder.release();
-        }
+
+        result.appendChild(all);
 
         return result;
     }