Changeset 1081 for trunk

Timestamp:

11/17/06 11:04:25 (2 years ago)

Author:

callan

Message:

Should now have *finally* squashed #462. Due to java.nio.channels.FileChannel? fun, we've had to move the "close()" closer to the retrieval of the mapped byte buffers in the rendering strategies.

Location:

trunk/components

Files:

• rendering/src/omeis/providers/re/GreyScaleStrategy.java (modified) (2 diffs)
• rendering/src/omeis/providers/re/HSBStrategy.java (modified) (3 diffs)
• server/src/ome/services/RenderingBean.java (modified) (1 diff)

trunk/components/rendering/src/omeis/providers/re/GreyScaleStrategy.java

@@ -40 +40 @@
 
 //Application-internal dependencies
+import ome.conditions.ResourceError;
 import ome.io.nio.PixelBuffer;
 import ome.model.core.Pixels;
@@ -256 +257 @@
                         }
                 }
+        // Make sure that the pixel buffer is cleansed properly.
+        try
+        {
+                        pixels.close();
+                }
+        catch (IOException e)
+        {
+                        e.printStackTrace();
+                        throw new ResourceError(e.getMessage());
+                }
         }
     

trunk/components/rendering/src/omeis/providers/re/HSBStrategy.java

@@ -46 +46 @@
 //j.mimport ome.util.concur.tasks.Future;
 
+import ome.conditions.ResourceError;
 import ome.io.nio.PixelBuffer;
 import ome.model.core.Pixels;
@@ -178 +179 @@
                 }
         }
+        
+        // Make sure that the pixel buffer is cleansed properly.
+        try
+        {
+                        pixels.close();
+                }
+        catch (IOException e)
+        {
+                        e.printStackTrace();
+                        throw new ResourceError(e.getMessage());
+                }
         return wData;
     }
@@ -347 +359 @@
             }
         }
+        
+        //Shutdown the task processor
+        processor.shutdown();
+        
+        //End the performance metrics for this rendering event.
         performanceStats.endRendering();
     }

trunk/components/server/src/ome/services/RenderingBean.java

@@ -330 +330 @@
             PixelBuffer buffer = pixDataSrv.getPixelBuffer(pixelsObj);
             renderer = new Renderer(pixMetaSrv, pixelsObj, rendDefObj, buffer);
-            try
-            {
-                if (buffer != null)
-                        buffer.close();
-                }
-            catch (IOException e)
-            {
-                        e.printStackTrace();
-                        throw new ResourceError(e.getMessage());
-                }
         }
         finally