Changeset 3439

Timestamp:

Jun 4, 2007, 9:22:07 AM (16 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #613.

Location:

branches/2.3.1

Files:

• src/core/net/sf/basedb/core/PluginResponse.java (modified) (2 diffs)
• www/common/import/index.jsp (modified) (4 diffs)
• www/common/plugin/index.jsp (modified) (4 diffs)

branches/2.3.1/src/core/net/sf/basedb/core/PluginResponse.java

@@ -27 +27 @@
 import net.sf.basedb.core.plugin.ExportOutputStream;
 import net.sf.basedb.core.plugin.ImmediateDownloadExporter;
+import net.sf.basedb.core.plugin.Plugin;
 import net.sf.basedb.core.plugin.Response;
 import net.sf.basedb.core.plugin.Request;
@@ -149 +150 @@
       throw new PermissionDeniedException("Cannot export since response status is: " + getStatus());
     }
-    ImmediateDownloadExporter exporter = (ImmediateDownloadExporter)request.getPlugin();
-    exporter.doExport(out, progress);
+    Plugin plugin = request.getPlugin();
+    try
+    {
+      ImmediateDownloadExporter exporter = (ImmediateDownloadExporter)plugin;
+      exporter.doExport(out, progress);
+    }
+    finally
+    {
+      plugin.done();
+    }
   }
   

branches/2.3.1/www/common/import/index.jsp

@@ -109 +109 @@
       for (PluginConfiguration pluginConfig : configQuery.list(dc))
       {
-        InteractivePlugin ip = plugin.newInstance(InteractivePlugin.class, null, sc, pluginConfig, null);
+        InteractivePlugin ip = null;
         String contextMessage = null;
         try
         {
+          ip = plugin.newInstance(InteractivePlugin.class, null, sc, pluginConfig, null);
           contextMessage = ip.isInContext(context, currentItem);
         }
@@ -118 +119 @@
         {
           contextMessage = t.getClass().getName() + ": " +  t.getMessage();
+        }
+        finally
+        {
+          if (ip != null) ip.done();
         }
         if (contextMessage == null)
@@ -136 +141 @@
       else if (!plugin.requiresConfiguration())
       {
-        InteractivePlugin ip = plugin.newInstance(InteractivePlugin.class, null, sc, null, null);
+        InteractivePlugin ip = null;
         String contextMessage = null;
         try
         {
+          ip = plugin.newInstance(InteractivePlugin.class, null, sc, null, null);
           contextMessage = ip.isInContext(context, currentItem);
         }
@@ -145 +151 @@
         {
           contextMessage = t.getClass().getName() + ": " +  t.getMessage();
+        }
+        finally
+        {
+          if (ip != null) ip.done();
         }
         if (contextMessage == null)

branches/2.3.1/www/common/plugin/index.jsp

@@ -148 +148 @@
       for (PluginConfiguration pluginConfig : configQuery.list(dc))
       {
-        InteractivePlugin ip = plugin.newInstance(InteractivePlugin.class, null, sc, pluginConfig, null);
+        InteractivePlugin ip = null;
         String contextMessage = null;
         try
         {
+          ip = plugin.newInstance(InteractivePlugin.class, null, sc, pluginConfig, null);
           contextMessage = ip.isInContext(context, currentItem);
         }
@@ -157 +158 @@
         {
           contextMessage = t.getClass().getName() + ": " +  t.getMessage();
+        }
+        finally
+        {
+          if (ip != null) ip.done();
         }
         if (contextMessage == null)
@@ -174 +179 @@
       else if (!plugin.requiresConfiguration())
       {
-        InteractivePlugin ip = plugin.newInstance(InteractivePlugin.class, null, sc, null, null);
+        InteractivePlugin ip = null;
         String contextMessage = null;
         try
         {
+          ip = plugin.newInstance(InteractivePlugin.class, null, sc, null, null);
           contextMessage = ip.isInContext(context, currentItem);
         }
@@ -183 +189 @@
         {
           contextMessage = t.getClass().getName() + ": " +  t.getMessage();
+        }
+        finally
+        {
+          if (ip != null) ip.done();
         }
         if (contextMessage == null)