inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged 5.2.N (5.2.1) to HEAD (5.2)

Browse Source 
125783 rmunteanu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      125605 rmunteanu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
         125498 slanglois: MNT-16155 Update source headers - remove svn:eol-style property on Java and JSP source files


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127809 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2016-06-03 16:45:04 +00:00
parent da8101a5ba
commit 19fcf2c411
325 changed files with 59952 additions and 59952 deletions
Download Patch File Download Diff File Expand all files Collapse all files

180
source/java/org/alfresco/rest/api/PublicApiHttpServletRequest.java
View File

@@ -1,90 +1,90 @@
package org.alfresco.rest.api;
import java.io.BufferedInputStream;
import java.io.IOException;
import java.io.InputStream;
import javax.servlet.ServletInputStream;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletRequestWrapper;
public class PublicApiHttpServletRequest extends HttpServletRequestWrapper
{
private static final String HEADER_CONTENT_TYPE = "Content-Type";
public static final String MULTIPART_FORM_DATA = "multipart/form-data";
public PublicApiHttpServletRequest(HttpServletRequest request) throws IOException
{
super(getWrappedHttpServletRequest(request));
}
public void resetInputStream() throws IOException
{
ServletInputStream stream = getInputStream();
if (stream.markSupported())
{
stream.reset();
}
}
private static HttpServletRequest getWrappedHttpServletRequest(HttpServletRequest request) throws IOException
{
//TODO is it really necessary to wrap the request into a BufferedInputStream?
// If not, then we could remove the check for multipart upload.
// The check is needed as we get an IOException (Resetting to invalid mark) for files more than 8193 bytes.
boolean resetSupported = true;
String contentType = request.getHeader(HEADER_CONTENT_TYPE);
if (contentType != null && contentType.startsWith(MULTIPART_FORM_DATA))
{
resetSupported = false;
}
final PublicApiServletInputStream sis = new PublicApiServletInputStream(request.getInputStream(), resetSupported);
HttpServletRequestWrapper wrapper = new HttpServletRequestWrapper(request)
{
public ServletInputStream getInputStream() throws java.io.IOException
{
return sis;
}
};
return wrapper;
}
private static class PublicApiServletInputStream extends ServletInputStream
{
private final InputStream in;
private final boolean resetSupported;
PublicApiServletInputStream(InputStream in, boolean resetSupported)
{
this.resetSupported = resetSupported;
if (resetSupported)
{
this.in = new BufferedInputStream(in);
this.in.mark(8096);
}
else
{
this.in = in;
}
}
@Override
public int read() throws IOException
{
return in.read();
}
@Override
public void reset() throws IOException
{
in.reset();
}
@Override
public boolean markSupported()
{
return resetSupported;
}
}
}
package org.alfresco.rest.api;
import java.io.BufferedInputStream;
import java.io.IOException;
import java.io.InputStream;
import javax.servlet.ServletInputStream;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletRequestWrapper;
public class PublicApiHttpServletRequest extends HttpServletRequestWrapper
{
private static final String HEADER_CONTENT_TYPE = "Content-Type";
public static final String MULTIPART_FORM_DATA = "multipart/form-data";
public PublicApiHttpServletRequest(HttpServletRequest request) throws IOException
{
super(getWrappedHttpServletRequest(request));
}
public void resetInputStream() throws IOException
{
ServletInputStream stream = getInputStream();
if (stream.markSupported())
{
stream.reset();
}
}
private static HttpServletRequest getWrappedHttpServletRequest(HttpServletRequest request) throws IOException
{
//TODO is it really necessary to wrap the request into a BufferedInputStream?
// If not, then we could remove the check for multipart upload.
// The check is needed as we get an IOException (Resetting to invalid mark) for files more than 8193 bytes.
boolean resetSupported = true;
String contentType = request.getHeader(HEADER_CONTENT_TYPE);
if (contentType != null && contentType.startsWith(MULTIPART_FORM_DATA))
{
resetSupported = false;
}
final PublicApiServletInputStream sis = new PublicApiServletInputStream(request.getInputStream(), resetSupported);
HttpServletRequestWrapper wrapper = new HttpServletRequestWrapper(request)
{
public ServletInputStream getInputStream() throws java.io.IOException
{
return sis;
}
};
return wrapper;
}
private static class PublicApiServletInputStream extends ServletInputStream
{
private final InputStream in;
private final boolean resetSupported;
PublicApiServletInputStream(InputStream in, boolean resetSupported)
{
this.resetSupported = resetSupported;
if (resetSupported)
{
this.in = new BufferedInputStream(in);
this.in.mark(8096);
}
else
{
this.in = in;
}
}
@Override
public int read() throws IOException
{
return in.read();
}
@Override
public void reset() throws IOException
{
in.reset();
}
@Override
public boolean markSupported()
{
return resetSupported;
}
}
}