Changeset 3003

Timestamp:

Dec 6, 2006, 12:25:46 PM (16 years ago)

Author:

Nicklas Nordborg

Message:

References #454: File upload times out

Possible fix but have to be tested with slow connection.

Location:

branches/2.1.2

Files:

• src/clients/web/net/sf/basedb/clients/web/fileupload/FileUpload.java (modified) (12 diffs)
• www/filemanager/upload/upload.jsp (modified) (1 diff)

branches/2.1.2/src/clients/web/net/sf/basedb/clients/web/fileupload/FileUpload.java

@@ -35 +35 @@
 import java.io.OutputStream;
 import java.io.IOException;
+import java.net.SocketTimeoutException;
 
 import javax.servlet.ServletRequest;
@@ -52 +53 @@
 {
 
+  /**
+    Debug file upload.
+  */
+  private static final org.apache.log4j.Logger log = 
+    org.apache.log4j.LogManager.getLogger("net.sf.basedb.clients.web.fileupload.FileUpload");
+  
+  private boolean debugEnabled = log.isDebugEnabled();
+
+  /**
+    The default timeout to use when waiting for the next data packet to
+    arrive.
+  */
+  public static final long DEFAULT_TIMEOUT = 20000;
+  
   private static final String EMPTY_STRING = "";
   
@@ -91 +106 @@
   private int transferRate = 0;
 
+  /**
+    The timeout in milliseconds that we wait for more data to arrive.
+    Default value is 20000 = 20 seconds.
+  */
+  private long timeout = DEFAULT_TIMEOUT;
+  
   /**
     Create a new <code>FileUpload</code> object which will read the posted
@@ -103 +124 @@
     throws IOException, UploadAbortedException
   {
-    this(request, 0);
+    this(request, 0, DEFAULT_TIMEOUT);
   }
 
@@ -113 +134 @@
     @param request The <code>ServletRequest</code> object containg information
       about the request (and file upload)
-    @param transferRate The maximum transfer rate in bytes per second
+    @param transferRate The maximum transfer rate in bytes per second, or 0
+      to transfer as fast as possible
+    @param timeout The timeout in milliseconds to wait for the next packet
+      of data to arrive
     @throws IOException If there is an error reading from the request stream
     @throws UploadAbortedException If the upload was aborted
   */
-  public FileUpload(ServletRequest request, int transferRate)
+  public FileUpload(ServletRequest request, int transferRate, long timeout)
     throws IOException, UploadAbortedException
   {
@@ -124 +148 @@
     this.status = new UploadStatus();
     this.transferRate = transferRate;
+    this.timeout = timeout;
     String contentType = request.getContentType();
     String sectionBoundary = "--"+contentType.substring(9+contentType.indexOf("boundary="));
@@ -452 +477 @@
   {
     byte[] line = new byte[1000];
-    int bytes = in.readLine(line, 0, line.length);
+    int bytes = readLine(line, 0, line.length);
     if (bytes != -1)
     {
@@ -467 +492 @@
     else
     {
-      status.eof = true;
-      in.close();
       return EMPTY_STRING;
     }
@@ -491 +514 @@
     {
       if (progress.hasAborted()) throw new UploadAbortedException();
-      bytes = in.readLine(line, 0, line.length);
-      if (bytes == -1)
-      {
-        status.eof = true;
-      }
-      else
+      bytes = readLine(line, 0, line.length);
+      if (bytes != -1)
       {
         progress.addTransferredBytes(bytes);
@@ -532 +551 @@
     {
       if (progress.hasAborted()) throw new UploadAbortedException();
-      bytes = in.readLine(line, 0, line.length);
-      if (bytes == -1)
-      {
-        status.eof = true;
-        in.close();
-      }
-      else
+      bytes = readLine(line, 0, line.length);
+      if (bytes != -1)
       {
         progress.addTransferredBytes(bytes);
@@ -606 +620 @@
     }
   }
+
+  /**
+    Read next line of data into a buffer.
+    @return The number of bytes read or -1 if the end is reached
+    @since 2.1.2
+  */
+  private int readLine(byte[] b, int off, int len)
+    throws IOException
+  {
+    int bytes = 0;
+    boolean gotData = false;
+    long startTime = System.currentTimeMillis();
+    while (!gotData)
+    {
+      try
+      {
+        if (debugEnabled) log.debug("Calling in.readLine() for more data");
+        bytes = in.readLine(b, off, len);
+        if (debugEnabled) log.debug("Got " + bytes + " bytes");
+        gotData = true;
+      }
+      catch (SocketTimeoutException ex)
+      {
+        long waitTime = System.currentTimeMillis() - startTime;
+        log.debug("SocketTimeoutException after " + waitTime + "ms", ex);
+        if (waitTime > timeout)
+        {
+          SocketTimeoutException ex2 = 
+            new SocketTimeoutException("No data for " + waitTime + " milliseconds");
+          ex2.initCause(ex);
+          log.debug("Total timeout exceeded after" + waitTime + "ms", ex2);
+          throw ex2;
+        }
+        else
+        {
+          log.debug("Sleeping 1000ms");
+          try
+          {
+            Thread.sleep(1000);
+          }
+          catch (Throwable t)
+          {}
+        }
+      }
+    }
+    if (bytes == -1)
+    {
+      status.eof = true;
+      in.close();
+    }
+    return bytes;
+  }
+  
   
   /**
@@ -793 +860 @@
       
       int boundaryLength = boundary.length;
-      int bytes = 0;
-      bytes = in.readLine(nextBuffer, 0, nextBuffer.length);
-
-      if (bytes == -1)
-      {
-        status.eof = true;
-        in.close();
-      }
-      else
+      int bytes = readLine(nextBuffer, 0, nextBuffer.length);
+
+      if (bytes != -1)
       {
         progress.addTransferredBytes(bytes);

branches/2.1.2/www/filemanager/upload/upload.jsp

@@ -74 +74 @@
 try
 {
-  upload = new FileUpload(request, maxTransferRate);
+  upload = new FileUpload(request, maxTransferRate, FileUpload.DEFAULT_TIMEOUT);
   final FileUploadProgress progress = upload.getProgress();
   sc.setSessionSetting("FileUploadProgress", progress);