Changeset 3440

Timestamp:

Jun 4, 2007, 9:31:57 AM (16 years ago)

Author:

Nicklas Nordborg

Message:

References #613. Must also call done() when unpacking zipped files. Updated documentation.

Location:

branches/2.3.1

Files:

• doc/src/docbook/developerdoc/plugin_developer.xml (modified) (3 diffs)
• www/filemanager/upload/upload.jsp (modified) (3 diffs)

branches/2.3.1/doc/src/docbook/developerdoc/plugin_developer.xml

@@ -1417 +1417 @@
         <listitem>
           <para>
-            After this, the plug-in instance is discarded. If there are
+            After this, <methodname>Plugin.done()</methodname> is called and 
+            the plug-in instance is discarded. If there are
             several configurations for a plug-in this procedure is repeated
             for each configuration.
           </para>
-
-          <warning>
-          <para>
-            The <methodname>Plugin.done()</methodname> method is never
-            called! This is bug that has been reported to the developers
-            and hopefully it will be fixed shortly.
-          </para>
-          </warning>
         </listitem>
         </orderedlist>
@@ -1826 +1819 @@
         same plug-in instance and call <methodname>ImmediateDownloadExporter.doExport()</methodname>.
         In this case, the <methodname>Plugin.run()</methodname> is never called.
-        
-        <note>
-          <para>
-          The <methodname>Plugin.done()</methodname> method is also never
-          called. This is a bug which has been reported to the developers.
-          </para>
-        </note>
+        After the export, <methodname>Plugin.done()</methodname> is called as
+        usual.
         </para>
         
@@ -2551 +2539 @@
           Then, the <methodname>unpack()</methodname> method is called. The
           <methodname>Plugin.run()</methodname> method is never called in this case.
-          The <methodname>Plugin.done()</methodname> method is also never called.
           </para>
         </listitem>

branches/2.3.1/www/filemanager/upload/upload.jsp

@@ -72 +72 @@
 DbControl dc = null;
 FileUpload upload = null;
+FileUnpacker unpacker = null;
 try
 {
@@ -101 +102 @@
     File f = null;
     OutputStream toFile = null;
-    FileUnpacker unpacker = null;
 
     // Set file properties, check for duplicate files, save new file etc.
@@ -211 +211 @@
 finally
 {
+  if (unpacker != null) unpacker.done();
   if (dc != null) dc.close();
 }