You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by vd...@apache.org on 2013/10/04 07:40:35 UTC
svn commit: r1529078 - in
/openmeetings/branches/2.x/src/org/apache/openmeetings:
servlet/outputhandler/DownloadHandler.java utils/OmFileHelper.java
Author: vdegtyarev
Date: Fri Oct 4 05:40:34 2013
New Revision: 1529078
URL: http://svn.apache.org/r1529078
Log:
OPENMEETINGS-811 is fixed. Recording files are downloaded via Chrome browser.
Modified:
openmeetings/branches/2.x/src/org/apache/openmeetings/servlet/outputhandler/DownloadHandler.java
openmeetings/branches/2.x/src/org/apache/openmeetings/utils/OmFileHelper.java
Modified: openmeetings/branches/2.x/src/org/apache/openmeetings/servlet/outputhandler/DownloadHandler.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/2.x/src/org/apache/openmeetings/servlet/outputhandler/DownloadHandler.java?rev=1529078&r1=1529077&r2=1529078&view=diff
==============================================================================
--- openmeetings/branches/2.x/src/org/apache/openmeetings/servlet/outputhandler/DownloadHandler.java (original)
+++ openmeetings/branches/2.x/src/org/apache/openmeetings/servlet/outputhandler/DownloadHandler.java Fri Oct 4 05:40:34 2013
@@ -26,6 +26,7 @@ import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.catalina.connector.ClientAbortException;
import org.apache.commons.lang3.StringUtils;
import org.apache.openmeetings.OpenmeetingsVariables;
import org.apache.openmeetings.data.basic.SessiondataDao;
@@ -300,6 +301,8 @@ public class DownloadHandler extends Bas
log.error("ERROR DownloadHandler: not authorized FileDownload ");
}
+ } catch (ClientAbortException e) {
+ log.warn("catch ClientAbortException : ", e);
} catch (ServerNotInitializedException e) {
return;
} catch (Exception er) {
Modified: openmeetings/branches/2.x/src/org/apache/openmeetings/utils/OmFileHelper.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/2.x/src/org/apache/openmeetings/utils/OmFileHelper.java?rev=1529078&r1=1529077&r2=1529078&view=diff
==============================================================================
--- openmeetings/branches/2.x/src/org/apache/openmeetings/utils/OmFileHelper.java (original)
+++ openmeetings/branches/2.x/src/org/apache/openmeetings/utils/OmFileHelper.java Fri Oct 4 05:40:34 2013
@@ -25,6 +25,7 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.text.DecimalFormat;
+import org.apache.catalina.connector.ClientAbortException;
import org.apache.commons.transaction.util.FileHelper;
import org.apache.openmeetings.OpenmeetingsVariables;
import org.red5.logging.Red5LoggerFactory;
@@ -270,6 +271,8 @@ public class OmFileHelper {
in = new FileInputStream(f1);
FileHelper.copy(in, out);
log.debug("File copied.");
+ } catch (ClientAbortException e) {
+ log.warn("catch ClientAbortException : ", e);
} catch (Exception e) {
log.error("[copyfile(File, File)]", e);
} finally {