--- a/artifact-database/src/main/java/de/intevation/artifactdatabase/AbstractCallContext.java	Thu Apr 14 10:19:12 2011 +0000
+++ b/artifact-database/src/main/java/de/intevation/artifactdatabase/AbstractCallContext.java	Thu Apr 14 11:18:10 2011 +0000
@@ -38,11 +38,6 @@
     protected CallMeta callMeta;
 
     /**
-     * The global context.
-     */
-    protected Object context;
-
-    /**
      * Map to act like a clipboard when nesting calls like a proxy artifact.
      */
     protected HashMap customValues;
@@ -58,17 +53,19 @@
     public AbstractCallContext(
         ArtifactDatabaseImpl artifactDatabase,
         int                  action,
-        CallMeta             callMeta,
-        Object               context)
-    {
+        CallMeta             callMeta
+    ) {
         this.database = artifactDatabase;
         this.action   = action;
         this.callMeta = callMeta;
-        this.context  = context;
+
+        database.initCallContext(this);
     }
 
 
-    public abstract void postCall();
+    public void postCall() {
+        database.closeCallContext(this);
+    }
 
     public abstract void afterCall(int action);
 
@@ -78,7 +75,7 @@
 
 
     public Object globalContext() {
-        return context;
+        return database.context;
     }