Changeset 3920

Timestamp:

Nov 7, 2007, 12:43:13 PM (14 years ago)

Author:

Martin Svensson

Message:

References #492 Creates a new OutputStream? for each upload and always return a MIMEtype in BaseFileDataSource?.

Location:

trunk/src/webservices

Files:

• client/java/net/sf/basedb/ws/client/AbstractRPCClient.java (modified) (1 diff)
• server/net/sf/basedb/ws/server/BaseFileDataSource.java (modified) (4 diffs)

trunk/src/webservices/client/java/net/sf/basedb/ws/client/AbstractRPCClient.java

@@ -101 +101 @@
       }
     }
+    out.close();
     return receivedFile;
   }

trunk/src/webservices/server/net/sf/basedb/ws/server/BaseFileDataSource.java

@@ -26 +26 @@
 import net.sf.basedb.core.File;
 
+import java.io.BufferedOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -40 +41 @@
 {
   private File file = null;
+  private OutputStream os = null;
 
   /**
@@ -52 +54 @@
   public String getContentType()
   {
-    return file.getMimeType();
+    return file.getMimeType() == null ? "application/octet-stream" : file.getMimeType();
   }
 
-  public InputStream getInputStream() throws IOException
+  public InputStream getInputStream() 
+    throws IOException
   {
     return file.getDownloadStream(0);
@@ -65 +68 @@
   }
 
-  public OutputStream getOutputStream() throws IOException
-  {   
-    return file.getUploadStream(false);
+  public OutputStream getOutputStream() 
+    throws IOException
+  {     
+    if (os != null) os.close();
+    os = new BufferedOutputStream(file.getUploadStream(false));
+    return os;
   }