Skip to content

Logger logs to err instead of info & Allow Uploads of files > maxint #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
JanWaller wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Logger logs to err instead of info & Allow Uploads of files > maxint #21

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
afe033c
Fix logger used in case of uploads (error by uploads without error ch…
JanWHD May 2, 2016
984f6e7
Allow for files > MAXINT bytes to be uploaded
JanWHD May 2, 2016
8302d66
Make work with GWT 2.8
csware Mar 31, 2017
5576526
Cleanup imports
csware Mar 31, 2017
9a671a4
Use proper XML
csware Mar 31, 2017
32061ec
Update for gwt 2.8
JanWHD Apr 25, 2017
19bdad9
fix bug duplicated uploaded file when POST is delayed
Sep 23, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions core/src/main/java/gwtupload/client/IUploader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ public String toString() {
/**
* Size in bytes calculated in the server
*/
public int size = 0;
public long size = 0;

/**
* Used when the server sends a special key to identify the file.
Expand Down Expand Up @@ -143,7 +143,7 @@ public String getCtype() {
return ctype;
}

public int getSize() {
public long getSize() {
return size;
}

Expand All @@ -163,7 +163,7 @@ public void setCtype(String ctype) {
this.ctype = ctype;
}

public void setSize(int size) {
public void setSize(long size) {
this.size = size;
}

Expand Down
9 changes: 5 additions & 4 deletions core/src/main/java/gwtupload/client/Uploader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1144,7 +1144,8 @@ private JavaScriptObject getDataInfo(UploadedInfo info) {
getDataImpl(info.fileUrl, info.field, info.name, Utils.basename(info.name), serverRawResponse, info.message, getStatus().toString(), info.size);
}

private native JavaScriptObject getDataImpl(String url, String inputName, String fileName, String baseName, String serverResponse, String serverMessage, String status, int size) /*-{
@com.google.gwt.core.client.UnsafeNativeLong
private native JavaScriptObject getDataImpl(String url, String inputName, String fileName, String baseName, String serverResponse, String serverMessage, String status, long size) /*-{
return {
url: url,
name: inputName,
Expand Down Expand Up @@ -1195,15 +1196,15 @@ private void parseAjaxResponse(String responseTxt) {

String size = Utils.getXmlNodeValue(doc, TAG_SIZE, i);
if (size != null) {
info.setSize(Integer.parseInt(size));
info.setSize(Long.parseLong(size));
}
serverMessage.getUploadedInfos().add(info);
}
}
} catch (Exception e) {
if (responseTxt.toLowerCase().matches("error")) {
// if (responseTxt.toLowerCase().matches("error")) {
error = i18nStrs.uploaderServerError() + "\nAction: " + getServletPath() + "\nException: " + e.getMessage() + responseTxt;
}
// }
}

if (error != null) {
Expand Down
6 changes: 3 additions & 3 deletions core/src/main/java/gwtupload/server/UploadServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -541,7 +541,7 @@ public void getUploadedFile(HttpServletRequest request, HttpServletResponse resp
String parameter = request.getParameter(UConsts.PARAM_SHOW);
FileItem item = findFileItem(getMySessionFileItems(request), parameter);
if (item != null) {
logger.error("UPLOAD-SERVLET (" + request.getSession().getId() + ") getUploadedFile: " + parameter + " returning: " + item.getContentType() + ", " + item.getName() + ", " + item.getSize()
logger.info("UPLOAD-SERVLET (" + request.getSession().getId() + ") getUploadedFile: " + parameter + " returning: " + item.getContentType() + ", " + item.getName() + ", " + item.getSize()
+ " bytes");
response.setContentType(item.getContentType());
copyFromInputStreamToOutputStream(item.getInputStream(), response.getOutputStream());
Expand Down Expand Up @@ -943,10 +943,10 @@ protected String parsePostRequest(HttpServletRequest request, HttpServletRespons
uploader.setProgressListener(listener);

// Receive the files
logger.error("UPLOAD-SERVLET (" + session.getId() + ") parsing HTTP POST request ");
logger.info("UPLOAD-SERVLET (" + session.getId() + ") parsing HTTP POST request ");
uploadedItems = uploader.parseRequest(request);
session.removeAttribute(getSessionLastFilesKey(request));
logger.error("UPLOAD-SERVLET (" + session.getId() + ") parsed request, " + uploadedItems.size() + " items received.");
logger.info("UPLOAD-SERVLET (" + session.getId() + ") parsed request, " + uploadedItems.size() + " items received.");

// Received files are put in session
List<FileItem> sessionFiles = getMySessionFileItems(request);
Expand Down