Skip to content

The Unified and Autonomous Development Platform

Fix issue #383 - Uploaded file sometimes gets empty content

Robin Shen283e9ee46932
diff --git a/server-core/src/main/java/io/onedev/server/CoreModule.java b/server-core/src/main/java/io/onedev/server/CoreModule.java
index 599344c562..e94cfbc866 100644
--- a/server-core/src/main/java/io/onedev/server/CoreModule.java
+++ b/server-core/src/main/java/io/onedev/server/CoreModule.java
@@ -271,11 +271,13 @@ import io.onedev.server.util.xstream.MapConverter;
import io.onedev.server.util.xstream.ReflectionConverter;
import io.onedev.server.util.xstream.StringConverter;
import io.onedev.server.util.xstream.VersionedDocumentConverter;
+import io.onedev.server.web.DefaultUploadItemManager;
import io.onedev.server.web.DefaultUrlManager;
import io.onedev.server.web.DefaultWicketFilter;
import io.onedev.server.web.DefaultWicketServlet;
import io.onedev.server.web.ExpectedExceptionContribution;
import io.onedev.server.web.ResourcePackScopeContribution;
+import io.onedev.server.web.UploadItemManager;
import io.onedev.server.web.WebApplication;
import io.onedev.server.web.WebApplicationConfigurator;
import io.onedev.server.web.avatar.AvatarManager;
@@ -660,6 +662,7 @@ public class CoreModule extends AbstractPluginModule {
bind(PullRequestEventBroadcaster.class);
bind(IssueEventBroadcaster.class);
bind(BuildEventBroadcaster.class);
+ bind(UploadItemManager.class).to(DefaultUploadItemManager.class);
bind(TaskButton.TaskFutureManager.class);
diff --git a/server-core/src/main/java/io/onedev/server/web/DefaultUploadItemManager.java b/server-core/src/main/java/io/onedev/server/web/DefaultUploadItemManager.java
new file mode 100644
index 0000000000..00163696ba
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/DefaultUploadItemManager.java
@@ -0,0 +1,99 @@
+package io.onedev.server.web;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import org.apache.commons.fileupload.FileItem;
+import org.quartz.ScheduleBuilder;
+import org.quartz.SimpleScheduleBuilder;
+
+import io.onedev.commons.launcher.loader.Listen;
+import io.onedev.server.event.system.SystemStarted;
+import io.onedev.server.event.system.SystemStopping;
+import io.onedev.server.persistence.annotation.Sessional;
+import io.onedev.server.util.schedule.SchedulableTask;
+import io.onedev.server.util.schedule.TaskScheduler;
+
+@Singleton
+public class DefaultUploadItemManager implements UploadItemManager, SchedulableTask {
+
+ private static final int CLEANUP_TIMEOUT = 60; // in minutes
+
+ private final TaskScheduler taskScheduler;
+
+ private String taskId;
+
+ private final Map<String, Uploaded> uploads = new ConcurrentHashMap<>();
+
+ @Inject
+ public DefaultUploadItemManager(TaskScheduler taskScheduler) {
+ this.taskScheduler = taskScheduler;
+ }
+
+ @Override
+ public void setUploadItems(String uploadId, List<FileItem> uploadItems) {
+ Uploaded prevUploaded = uploads.put(uploadId, new Uploaded(uploadItems));
+ if (prevUploaded != null) {
+ for (FileItem item: prevUploaded.items)
+ item.delete();
+ }
+ }
+
+ @Override
+ public List<FileItem> getUploadItems(String uploadId) {
+ Uploaded uploaded = uploads.get(uploadId);
+ if (uploaded == null) {
+ uploaded = new Uploaded(new ArrayList<>());
+ uploads.put(uploadId, uploaded);
+ }
+ return uploaded.items;
+ }
+
+ @Listen
+ public void on(SystemStarted event) {
+ taskId = taskScheduler.schedule(this);
+ }
+
+ @Listen
+ public void on(SystemStopping event) {
+ taskScheduler.unschedule(taskId);
+ }
+
+ @Sessional
+ @Override
+ public void execute() {
+ long now = System.currentTimeMillis();
+ for (Iterator<Map.Entry<String, Uploaded>> it = uploads.entrySet().iterator(); it.hasNext();) {
+ Uploaded uploaded = it.next().getValue();
+ if (now - uploaded.date.getTime() > CLEANUP_TIMEOUT*60000L) {
+ it.remove();
+ for (FileItem item: uploaded.items)
+ item.delete();
+ }
+ }
+ }
+
+ @Override
+ public ScheduleBuilder<?> getScheduleBuilder() {
+ return SimpleScheduleBuilder.repeatMinutelyForever(CLEANUP_TIMEOUT);
+ }
+
+ private static class Uploaded {
+
+ private final Date date = new Date();
+
+ private final List<FileItem> items;
+
+ private Uploaded(List<FileItem> items) {
+ this.items = items;
+ }
+
+ }
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/UploadItemManager.java b/server-core/src/main/java/io/onedev/server/web/UploadItemManager.java
new file mode 100644
index 0000000000..119ef1272b
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/UploadItemManager.java
@@ -0,0 +1,13 @@
+package io.onedev.server.web;
+
+import java.util.List;
+
+import org.apache.commons.fileupload.FileItem;
+
+public interface UploadItemManager {
+
+ void setUploadItems(String uploadId, List<FileItem> uploadItems);
+
+ List<FileItem> getUploadItems(String uploadId);
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/dropzonefield/DropzoneField.java b/server-core/src/main/java/io/onedev/server/web/component/dropzonefield/DropzoneField.java
index 5365c00ce9..af5810a077 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/dropzonefield/DropzoneField.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/dropzonefield/DropzoneField.java
@@ -4,6 +4,7 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
+import java.util.UUID;
import javax.annotation.Nullable;
@@ -16,7 +17,6 @@ import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
import org.apache.wicket.markup.html.form.FormComponentPanel;
-import org.apache.wicket.markup.html.form.upload.FileUpload;
import org.apache.wicket.model.IModel;
import org.apache.wicket.protocol.http.servlet.MultipartServletWebRequest;
import org.apache.wicket.protocol.http.servlet.ServletWebRequest;
@@ -24,7 +24,10 @@ import org.apache.wicket.request.IRequestParameters;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.util.lang.Bytes;
+import io.onedev.server.OneDev;
+import io.onedev.server.web.UploadItemManager;
import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;
+import io.onedev.server.web.util.FileUpload;
@SuppressWarnings("serial")
public class DropzoneField extends FormComponentPanel<Collection<FileUpload>> {
@@ -39,7 +42,7 @@ public class DropzoneField extends FormComponentPanel<Collection<FileUpload>> {
private AbstractPostAjaxBehavior deleteBehavior;
- private List<FileItem> fileItems = new ArrayList<>();
+ private String uploadId = UUID.randomUUID().toString();
/**
* @param id
@@ -61,10 +64,14 @@ public class DropzoneField extends FormComponentPanel<Collection<FileUpload>> {
this.maxFilesize = maxFilesize;
}
+ private UploadItemManager getUploadItemManager() {
+ return OneDev.getInstance(UploadItemManager.class);
+ }
+
@Override
protected void onBeforeRender() {
// In order to be consistent with browser side
- fileItems.clear();
+ getUploadItemManager().setUploadItems(uploadId, new ArrayList<>());
super.onBeforeRender();
}
@@ -81,7 +88,8 @@ public class DropzoneField extends FormComponentPanel<Collection<FileUpload>> {
MultipartServletWebRequest multiPartRequest = webRequest.newMultipartWebRequest(
Bytes.megabytes(maxFilesize), "ignored");
multiPartRequest.parseFileParts();
- fileItems.addAll(multiPartRequest.getFiles().get("file"));
+ List<FileItem> items = getUploadItemManager().getUploadItems(uploadId);
+ items.addAll(multiPartRequest.getFiles().get("file"));
} catch (FileUploadException e) {
throw new RuntimeException(e);
}
@@ -101,7 +109,8 @@ public class DropzoneField extends FormComponentPanel<Collection<FileUpload>> {
protected void respond(AjaxRequestTarget target) {
IRequestParameters params = RequestCycle.get().getRequest().getPostParameters();
String fileName = params.getParameterValue("name").toString();
- for (Iterator<FileItem> it = fileItems.iterator(); it.hasNext();) {
+ List<FileItem> items = getUploadItemManager().getUploadItems(uploadId);
+ for (Iterator<FileItem> it = items.iterator(); it.hasNext();) {
FileItem fileItem = it.next();
if (fileItem.getName().equals(fileName)) {
fileItem.delete();
@@ -116,13 +125,13 @@ public class DropzoneField extends FormComponentPanel<Collection<FileUpload>> {
@Override
public void convertInput() {
- if (fileItems.isEmpty()) {
+ List<FileItem> items = getUploadItemManager().getUploadItems(uploadId);
+ if (items.isEmpty()) {
setConvertedInput(null);
} else {
Collection<FileUpload> uploads = new ArrayList<>();
- for (FileItem fileItem: fileItems) {
- uploads.add(new FileUpload(fileItem));
- }
+ for (int i=0; i<items.size(); i++)
+ uploads.add(new FileUpload(uploadId, i));
setConvertedInput(uploads);
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/InsertUrlPanel.html b/server-core/src/main/java/io/onedev/server/web/component/markdown/InsertUrlPanel.html
index 4ad42779b7..b2337ff6ed 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/InsertUrlPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/InsertUrlPanel.html
@@ -71,13 +71,9 @@
<p class="form-text text-muted">Optionally specify relative directory to put uploaded files</p>
</div>
<div class="form-group">
- <label>Summary Commit Message</label>
- <input wicket:id="summaryCommitMessage" class="form-control" placeholder="Add files via upload"></input>
+ <label>Commit Message</label>
+ <textarea wicket:id="commitMessage" placeholder="Add files via upload" class="form-control" rows="6"></textarea>
</div>
- <div class="form-group">
- <label>Detail Commit Message</label>
- <textarea wicket:id="detailCommitMessage" class="form-control" rows="5"></textarea>
- </div>
<div class="text-right">
<button wicket:id="insert" class="btn btn-primary">Commit &amp; Insert</button>
</div>
diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/InsertUrlPanel.java b/server-core/src/main/java/io/onedev/server/web/component/markdown/InsertUrlPanel.java
index 7a13f87e98..53ffc3d10a 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/InsertUrlPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/InsertUrlPanel.java
@@ -28,7 +28,6 @@ import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.TextArea;
import org.apache.wicket.markup.html.form.TextField;
-import org.apache.wicket.markup.html.form.upload.FileUpload;
import org.apache.wicket.markup.html.image.ExternalImage;
import org.apache.wicket.markup.html.list.ListItem;
import org.apache.wicket.markup.html.list.ListView;
@@ -67,6 +66,7 @@ import io.onedev.server.web.component.tabbable.Tab;
import io.onedev.server.web.component.tabbable.Tabbable;
import io.onedev.server.web.page.project.blob.ProjectBlobPage;
import io.onedev.server.web.page.project.blob.render.BlobRenderContext;
+import io.onedev.server.web.util.FileUpload;
@SuppressWarnings("serial")
abstract class InsertUrlPanel extends Panel {
@@ -89,15 +89,13 @@ abstract class InsertUrlPanel extends Panel {
private static final String CONTENT_ID = "content";
- private Collection<FileUpload> uploads;
+ private Collection<FileUpload> uploads = new ArrayList<>();
private String url;
private String text;
- private String summaryCommitMessage;
-
- private String detailCommitMessage;
+ private String commitMessage;
private final MarkdownEditor markdownEditor;
@@ -402,7 +400,8 @@ abstract class InsertUrlPanel extends Panel {
FileUpload upload = uploads.iterator().next();
try (InputStream is = upload.getInputStream()) {
attachmentName = attachmentSupport.saveAttachment(
- FilenameUtils.sanitizeFilename(upload.getClientFileName()), is);
+ FilenameUtils.sanitizeFilename(upload.getFileName()), is);
+ upload.release();
} catch (IOException e) {
throw new RuntimeException(e);
}
@@ -514,19 +513,8 @@ abstract class InsertUrlPanel extends Panel {
}
};
- form.add(new TextField<String>("summaryCommitMessage",
- new PropertyModel<String>(this, "summaryCommitMessage")).add(behavior));
-
- behavior = new ReferenceInputBehavior(true) {
-
- @Override
- protected Project getProject() {
- return markdownEditor.getBlobRenderContext().getProject();
- }
-
- };
- form.add(new TextArea<String>("detailCommitMessage",
- new PropertyModel<String>(this, "detailCommitMessage")).add(behavior));
+ form.add(new TextArea<String>("commitMessage",
+ new PropertyModel<String>(this, "commitMessage")).add(behavior));
form.add(new AjaxButton("insert") {
@@ -535,24 +523,22 @@ abstract class InsertUrlPanel extends Panel {
super.onSubmit(target, form);
BlobRenderContext context = Preconditions.checkNotNull(markdownEditor.getBlobRenderContext());
- String commitMessage = summaryCommitMessage;
+ String commitMessage = InsertUrlPanel.this.commitMessage;
if (StringUtils.isBlank(commitMessage))
commitMessage = "Add files via upload";
- if (StringUtils.isNotBlank(detailCommitMessage))
- commitMessage += "\n\n" + detailCommitMessage;
-
try {
String directory = WebSession.get().getMetaData(UPLOAD_DIRECTORY);
context.onCommitted(null, context.uploadFiles(uploads, directory, commitMessage));
-
- String fileName = uploads.iterator().next().getClientFileName();
+ String fileName = uploads.iterator().next().getFileName();
String url;
if (directory != null)
- url = directory + "/" + UrlUtils.encodePath(fileName);
+ url = StringUtils.stripEnd(directory, "/") + "/" + UrlUtils.encodePath(fileName);
else
url = UrlUtils.encodePath(fileName);
markdownEditor.insertUrl(target, isImage, url, fileName, null);
+ for (FileUpload upload: uploads)
+ upload.release();
onClose(target);
} catch (GitException e) {
form.error(e.getMessage());
@@ -646,6 +632,8 @@ abstract class InsertUrlPanel extends Panel {
@Override
public void onClick(AjaxRequestTarget target) {
+ for (FileUpload upload: uploads)
+ upload.release();
onClose(target);
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/BlobUploadPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/blob/BlobUploadPanel.html
index 3bb735f346..3d4a00eaba 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/BlobUploadPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/BlobUploadPanel.html
@@ -15,12 +15,8 @@
<p class="form-text text-muted">Optionally specify relative directory to put uploaded files</p>
</div>
<div class="form-group">
- <label>Summary Commit Message</label>
- <input wicket:id="summaryCommitMessage" class="form-control" placeholder="Add files via upload"></input>
- </div>
- <div class="form-group">
- <label>Detail Commit Message</label>
- <textarea wicket:id="detailCommitMessage" class="form-control" rows="5"></textarea>
+ <label>Commit Message</label>
+ <textarea wicket:id="commitMessage" class="form-control" placeholder="Add files via upload" rows="6"></textarea>
</div>
</div>
<div class="modal-footer">
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/BlobUploadPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/BlobUploadPanel.java
index 0ad14b987d..b5eaed680a 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/BlobUploadPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/BlobUploadPanel.java
@@ -11,7 +11,6 @@ import org.apache.wicket.feedback.FencedFeedbackPanel;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.TextArea;
import org.apache.wicket.markup.html.form.TextField;
-import org.apache.wicket.markup.html.form.upload.FileUpload;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.Model;
import org.apache.wicket.model.PropertyModel;
@@ -22,6 +21,7 @@ import io.onedev.server.model.Project;
import io.onedev.server.web.behavior.ReferenceInputBehavior;
import io.onedev.server.web.component.dropzonefield.DropzoneField;
import io.onedev.server.web.page.project.blob.render.BlobRenderContext;
+import io.onedev.server.web.util.FileUpload;
@SuppressWarnings("serial")
public abstract class BlobUploadPanel extends Panel {
@@ -30,9 +30,7 @@ public abstract class BlobUploadPanel extends Panel {
private String directory;
- private String summaryCommitMessage;
-
- private String detailCommitMessage;
+ private String commitMessage;
private final Collection<FileUpload> uploads = new ArrayList<>();
@@ -72,14 +70,14 @@ public abstract class BlobUploadPanel extends Panel {
protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
super.onSubmit(target, form);
- String commitMessage = summaryCommitMessage;
+ String commitMessage = BlobUploadPanel.this.commitMessage;
if (StringUtils.isBlank(commitMessage))
commitMessage = "Add files via upload";
- if (StringUtils.isNotBlank(detailCommitMessage))
- commitMessage += "\n\n" + detailCommitMessage;
-
RefUpdated refUpdated = context.uploadFiles(uploads, directory, commitMessage);
+ for (FileUpload upload: uploads)
+ upload.release();
+
onCommitted(target, refUpdated);
}
@@ -101,24 +99,15 @@ public abstract class BlobUploadPanel extends Panel {
}
};
- form.add(new TextField<String>("summaryCommitMessage",
- new PropertyModel<String>(this, "summaryCommitMessage")).add(behavior));
-
- behavior = new ReferenceInputBehavior(true) {
-
- @Override
- protected Project getProject() {
- return context.getProject();
- }
-
- };
- form.add(new TextArea<String>("detailCommitMessage",
- new PropertyModel<String>(this, "detailCommitMessage")).add(behavior));
+ form.add(new TextArea<String>("commitMessage",
+ new PropertyModel<String>(this, "commitMessage")).add(behavior));
form.add(new AjaxLink<Void>("cancel") {
@Override
public void onClick(AjaxRequestTarget target) {
+ for (FileUpload upload: uploads)
+ upload.release();
onCancel(target);
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java
index c07070ca33..a30327d89b 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java
@@ -31,7 +31,6 @@ import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.form.upload.FileUpload;
import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
@@ -117,6 +116,7 @@ import io.onedev.server.web.page.project.blob.search.result.SearchResultPanel;
import io.onedev.server.web.page.project.commits.ProjectCommitsPage;
import io.onedev.server.web.resource.RawBlobResourceReference;
import io.onedev.server.web.util.EditParamsAware;
+import io.onedev.server.web.util.FileUpload;
import io.onedev.server.web.websocket.WebSocketManager;
@SuppressWarnings("serial")
@@ -1464,7 +1464,7 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext,
BlobIdent blobIdent = getBlobIdent();
for (FileUpload upload: uploads) {
- String blobPath = FilenameUtils.sanitizeFilename(upload.getClientFileName());
+ String blobPath = FilenameUtils.sanitizeFilename(upload.getFileName());
if (parentPath != null)
blobPath = parentPath + "/" + blobPath;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/BlobRenderContext.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/BlobRenderContext.java
index 93657f5e97..df86e8f1dc 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/BlobRenderContext.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/BlobRenderContext.java
@@ -7,7 +7,6 @@ import java.util.List;
import javax.annotation.Nullable;
import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.markup.html.form.upload.FileUpload;
import org.eclipse.jgit.revwalk.RevCommit;
import io.onedev.commons.utils.PlanarRange;
@@ -17,6 +16,7 @@ import io.onedev.server.model.CodeComment;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.search.code.hit.QueryHit;
+import io.onedev.server.web.util.FileUpload;
public interface BlobRenderContext extends Serializable {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.java
index 9f3307b888..65bd856233 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.java
@@ -166,7 +166,7 @@ public class CommitOptionPanel extends Panel {
form.add(new FencedFeedbackPanel("feedback", form));
newChangesOfOthersContainer(null);
- commitMessageBean.setSummary(getDefaultCommitMessage());
+ commitMessageBean.setCommitMessage(getDefaultCommitMessage());
form.add(BeanContext.edit("commitMessage", commitMessageBean));
AjaxButton saveButton = new AjaxButton("save") {
@@ -247,9 +247,7 @@ public class CommitOptionPanel extends Panel {
target.add(form);
return false;
} else {
- String commitMessage = commitMessageBean.getSummary();
- if (StringUtils.isNotBlank(commitMessageBean.getBody()))
- commitMessage += "\n\n" + commitMessageBean.getBody();
+ String commitMessage = commitMessageBean.getCommitMessage();
User user = Preconditions.checkNotNull(SecurityUtils.getUser());
String revision = context.getBlobIdent().revision;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/MergeConfirmPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/MergeConfirmPanel.java
index 8987fd9092..09621b7093 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/MergeConfirmPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/MergeConfirmPanel.java
@@ -6,6 +6,7 @@ import static io.onedev.server.model.support.pullrequest.MergeStrategy.SQUASH_SO
import java.util.List;
+import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.eclipse.jgit.revwalk.RevCommit;
@@ -32,6 +33,7 @@ public abstract class MergeConfirmPanel extends OperationConfirmPanel {
protected void onInitialize() {
super.onInitialize();
+ String commitMessageBody = null;
PullRequest request = getPullRequest();
if (request.getMergeStrategy() == MergeStrategy.SQUASH_SOURCE_BRANCH_COMMITS) {
StringBuilder builder = new StringBuilder();
@@ -47,26 +49,35 @@ public abstract class MergeConfirmPanel extends OperationConfirmPanel {
}
}
- bean.setBody(builder.toString().trim());
+ commitMessageBody = builder.toString().trim();
}
+ String commitMessageSummary = null;
String description = null;
MergeStrategy mergeStrategy = getPullRequest().getMergeStrategy();
MergePreview mergePreview = getPullRequest().getMergePreview();
if (mergeStrategy == CREATE_MERGE_COMMIT)
- bean.setSummary("Merge pull request " + request.getNumberAndTitle());
+ commitMessageSummary = "Merge pull request " + request.getNumberAndTitle();
else if (mergeStrategy == SQUASH_SOURCE_BRANCH_COMMITS)
- bean.setSummary("Pull request " + request.getNumberAndTitle());
+ commitMessageSummary = "Pull request " + request.getNumberAndTitle();
else if (mergeStrategy == REBASE_SOURCE_BRANCH_COMMITS)
description = "Source branch commits will be rebased onto target branch";
else if (mergePreview.getMergeCommitHash().equals(mergePreview.getHeadCommitHash()))
description = "Source branch commits will be fast-forwarded to target branch";
else
- bean.setSummary("Merge pull request " + request.getNumberAndTitle());
+ commitMessageSummary = "Merge pull request " + request.getNumberAndTitle();
getForm().add(new Label("description", description).setVisible(description != null));
-
- getForm().add(BeanContext.edit("commitMessage", bean).setVisible(description == null));
+
+ if (commitMessageSummary != null) {
+ String commitMessage = commitMessageSummary;
+ if (commitMessageBody != null)
+ commitMessage += "\n\n" + commitMessageBody;
+ bean.setCommitMessage(commitMessage);
+ getForm().add(BeanContext.edit("commitMessage", bean));
+ } else {
+ getForm().add(new WebMarkupContainer("commitMessage").setVisible(false));
+ }
}
private PullRequest getPullRequest() {
@@ -74,16 +85,7 @@ public abstract class MergeConfirmPanel extends OperationConfirmPanel {
}
public String getCommitMessage() {
- if (bean.getSummary() != null) {
- StringBuilder builder = new StringBuilder(bean.getSummary());
- if (bean.getBody() != null) {
- builder.append("\n\n");
- builder.append(bean.getBody());
- }
- return builder.toString();
- } else {
- return null;
- }
+ return bean.getCommitMessage();
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/util/CommitMessageBean.java b/server-core/src/main/java/io/onedev/server/web/util/CommitMessageBean.java
index f82d01e8db..2e4b5eb6bf 100644
--- a/server-core/src/main/java/io/onedev/server/web/util/CommitMessageBean.java
+++ b/server-core/src/main/java/io/onedev/server/web/util/CommitMessageBean.java
@@ -14,32 +14,19 @@ public class CommitMessageBean implements Serializable {
private static final long serialVersionUID = 1L;
- private String summary;
+ private String commitMessage;
- private String body;
-
- @Editable(order=100, name="Commit Message Summary")
- @NotEmpty
- @OmitName
- @ReferenceAware
- public String getSummary() {
- return summary;
- }
-
- public void setSummary(String summary) {
- this.summary = summary;
- }
-
- @Editable(order=200, name="Commit Message Body")
+ @Editable(order=100, name="Commit Message")
@Multiline
@OmitName
@ReferenceAware
- public String getBody() {
- return body;
+ @NotEmpty
+ public String getCommitMessage() {
+ return commitMessage;
}
- public void setBody(String body) {
- this.body = body;
+ public void setCommitMessage(String commitMessage) {
+ this.commitMessage = commitMessage;
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/util/FileUpload.java b/server-core/src/main/java/io/onedev/server/web/util/FileUpload.java
new file mode 100644
index 0000000000..8cb4b3e84c
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/util/FileUpload.java
@@ -0,0 +1,72 @@
+package io.onedev.server.web.util;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.commons.fileupload.FileItem;
+import org.apache.wicket.util.string.Strings;
+
+import io.onedev.commons.utils.ExplicitException;
+import io.onedev.server.OneDev;
+import io.onedev.server.web.UploadItemManager;
+
+public class FileUpload implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ private final String uploadId;
+
+ private final int uploadIndex;
+
+ private transient FileItem uploadItem;
+
+ public FileUpload(String uploadId, int uploadIndex) {
+ this.uploadId = uploadId;
+ this.uploadIndex = uploadIndex;
+ }
+
+ private FileItem getUploadItem() {
+ if (uploadItem == null) {
+ List<FileItem> items = OneDev.getInstance(UploadItemManager.class).getUploadItems(uploadId);
+ if (uploadIndex >= items.size())
+ throw new ExplicitException("Uploaded files timed out and cleaned up");
+ uploadItem = items.get(uploadIndex);
+ }
+ return uploadItem;
+ }
+
+ public String getFileName() {
+ String name = getUploadItem().getName();
+
+ // when uploading from localhost some browsers will specify the entire path, we strip it
+ // down to just the file name
+ name = Strings.lastPathComponent(name, '/');
+ name = Strings.lastPathComponent(name, '\\');
+
+ return name;
+ }
+
+ public InputStream getInputStream() {
+ try {
+ return getUploadItem().getInputStream();
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ public String getContentType() {
+ return getUploadItem().getContentType();
+ }
+
+ public byte[] getBytes() {
+ return getUploadItem().get();
+ }
+
+ public void release() {
+ OneDev.getInstance(UploadItemManager.class).setUploadItems(uploadId, new ArrayList<>());
+ }
+
+}
diff --git a/server-core/src/main/java/org/apache/commons/fileupload/disk/DiskFileItem.java b/server-core/src/main/java/org/apache/commons/fileupload/disk/DiskFileItem.java
deleted file mode 100644
index a9b8808844..0000000000
--- a/server-core/src/main/java/org/apache/commons/fileupload/disk/DiskFileItem.java
+++ /dev/null
@@ -1,711 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.commons.fileupload.disk;
-
-import static java.lang.String.format;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
-import java.util.Map;
-import java.util.UUID;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import org.apache.commons.fileupload.FileItem;
-import org.apache.commons.fileupload.FileItemHeaders;
-import org.apache.commons.fileupload.FileUploadException;
-import org.apache.commons.fileupload.ParameterParser;
-import org.apache.commons.fileupload.util.Streams;
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.io.output.DeferredFileOutputStream;
-
-/**
- * <p> The default implementation of the
- * {@link org.apache.commons.fileupload.FileItem FileItem} interface.
- *
- * <p> After retrieving an instance of this class from a {@link
- * DiskFileItemFactory} instance (see
- * {@link org.apache.commons.fileupload.servlet.ServletFileUpload
- * #parseRequest(javax.servlet.http.HttpServletRequest)}), you may
- * either request all contents of file at once using {@link #get()} or
- * request an {@link java.io.InputStream InputStream} with
- * {@link #getInputStream()} and process the file without attempting to load
- * it into memory, which may come handy with large files.
- *
- * <p>Temporary files, which are created for file items, should be
- * deleted later on. The best way to do this is using a
- * {@link org.apache.commons.io.FileCleaningTracker}, which you can set on the
- * {@link DiskFileItemFactory}. However, if you do use such a tracker,
- * then you must consider the following: Temporary files are automatically
- * deleted as soon as they are no longer needed. (More precisely, when the
- * corresponding instance of {@link java.io.File} is garbage collected.)
- * This is done by the so-called reaper thread, which is started and stopped
- * automatically by the {@link org.apache.commons.io.FileCleaningTracker} when
- * there are files to be tracked.
- * It might make sense to terminate that thread, for example, if
- * your web application ends. See the section on "Resource cleanup"
- * in the users guide of commons-fileupload.</p>
- *
- * @since FileUpload 1.1
- *
- * @version $Id: DiskFileItem.java 1565192 2014-02-06 12:14:16Z markt $
- */
-public class DiskFileItem
- implements FileItem {
-
- // ----------------------------------------------------- Manifest constants
-
- /**
- * The UID to use when serializing this instance.
- */
- private static final long serialVersionUID = 2237570099615271025L;
-
- /**
- * Default content charset to be used when no explicit charset
- * parameter is provided by the sender. Media subtypes of the
- * "text" type are defined to have a default charset value of
- * "ISO-8859-1" when received via HTTP.
- */
- public static final String DEFAULT_CHARSET = "ISO-8859-1";
-
- // ----------------------------------------------------------- Data members
-
- /**
- * UID used in unique file name generation.
- */
- private static final String UID =
- UUID.randomUUID().toString().replace('-', '_');
-
- /**
- * Counter used in unique identifier generation.
- */
- private static final AtomicInteger COUNTER = new AtomicInteger(0);
-
- /**
- * The name of the form field as provided by the browser.
- */
- private String fieldName;
-
- /**
- * The content type passed by the browser, or <code>null</code> if
- * not defined.
- */
- private final String contentType;
-
- /**
- * Whether or not this item is a simple form field.
- */
- private boolean isFormField;
-
- /**
- * The original filename in the user's filesystem.
- */
- private final String fileName;
-
- /**
- * The size of the item, in bytes. This is used to cache the size when a
- * file item is moved from its original location.
- */
- private long size = -1;
-
-
- /**
- * The threshold above which uploads will be stored on disk.
- */
- private final int sizeThreshold;
-
- /**
- * The directory in which uploaded files will be stored, if stored on disk.
- */
- private final File repository;
-
- /**
- * Cached contents of the file.
- */
- private byte[] cachedContent;
-
- /**
- * Output stream for this item.
- */
- private transient DeferredFileOutputStream dfos;
-
- /**
- * The temporary file to use.
- */
- private transient File tempFile;
-
- /**
- * File to allow for serialization of the content of this item.
- */
- private File dfosFile;
-
- /**
- * The file items headers.
- */
- private FileItemHeaders headers;
-
- // ----------------------------------------------------------- Constructors
-
- /**
- * Constructs a new <code>DiskFileItem</code> instance.
- *
- * @param fieldName The name of the form field.
- * @param contentType The content type passed by the browser or
- * <code>null</code> if not specified.
- * @param isFormField Whether or not this item is a plain form field, as
- * opposed to a file upload.
- * @param fileName The original filename in the user's filesystem, or
- * <code>null</code> if not specified.
- * @param sizeThreshold The threshold, in bytes, below which items will be
- * retained in memory and above which they will be
- * stored as a file.
- * @param repository The data repository, which is the directory in
- * which files will be created, should the item size
- * exceed the threshold.
- */
- public DiskFileItem(String fieldName,
- String contentType, boolean isFormField, String fileName,
- int sizeThreshold, File repository) {
- this.fieldName = fieldName;
- this.contentType = contentType;
- this.isFormField = isFormField;
- this.fileName = fileName;
- this.sizeThreshold = sizeThreshold;
- this.repository = repository;
- }
-
- // ------------------------------- Methods from javax.activation.DataSource
-
- /**
- * Returns an {@link java.io.InputStream InputStream} that can be
- * used to retrieve the contents of the file.
- *
- * @return An {@link java.io.InputStream InputStream} that can be
- * used to retrieve the contents of the file.
- *
- * @throws IOException if an error occurs.
- */
- public InputStream getInputStream()
- throws IOException {
- if (!isInMemory()) {
- return new FileInputStream(dfos.getFile());
- }
-
- if (cachedContent == null) {
- cachedContent = dfos.getData();
- }
- return new ByteArrayInputStream(cachedContent);
- }
-
- /**
- * Returns the content type passed by the agent or <code>null</code> if
- * not defined.
- *
- * @return The content type passed by the agent or <code>null</code> if
- * not defined.
- */
- public String getContentType() {
- return contentType;
- }
-
- /**
- * Returns the content charset passed by the agent or <code>null</code> if
- * not defined.
- *
- * @return The content charset passed by the agent or <code>null</code> if
- * not defined.
- */
- public String getCharSet() {
- ParameterParser parser = new ParameterParser();
- parser.setLowerCaseNames(true);
- // Parameter parser can handle null input
- Map<String, String> params = parser.parse(getContentType(), ';');
- return params.get("charset");
- }
-
- /**
- * Returns the original filename in the client's filesystem.
- *
- * @return The original filename in the client's filesystem.
- * @throws org.apache.commons.fileupload.InvalidFileNameException The file name contains a NUL character,
- * which might be an indicator of a security attack. If you intend to
- * use the file name anyways, catch the exception and use
- * {@link org.apache.commons.fileupload.InvalidFileNameException#getName()}.
- */
- public String getName() {
- return Streams.checkFileName(fileName);
- }
-
- // ------------------------------------------------------- FileItem methods
-
- /**
- * Provides a hint as to whether or not the file contents will be read
- * from memory.
- *
- * @return <code>true</code> if the file contents will be read
- * from memory; <code>false</code> otherwise.
- */
- public boolean isInMemory() {
- if (cachedContent != null) {
- return true;
- }
- return dfos.isInMemory();
- }
-
- /**
- * Returns the size of the file.
- *
- * @return The size of the file, in bytes.
- */
- public long getSize() {
- if (size >= 0) {
- return size;
- } else if (cachedContent != null) {
- return cachedContent.length;
- } else if (dfos.isInMemory()) {
- return dfos.getData().length;
- } else {
- return dfos.getFile().length();
- }
- }
-
- /**
- * Returns the contents of the file as an array of bytes. If the
- * contents of the file were not yet cached in memory, they will be
- * loaded from the disk storage and cached.
- *
- * @return The contents of the file as an array of bytes.
- */
- public byte[] get() {
- if (isInMemory()) {
- if (cachedContent == null) {
- cachedContent = dfos.getData();
- }
- return cachedContent;
- }
-
- byte[] fileData = new byte[(int) getSize()];
- InputStream fis = null;
-
- try {
- fis = new BufferedInputStream(new FileInputStream(dfos.getFile()));
- fis.read(fileData);
- } catch (IOException e) {
- fileData = null;
- } finally {
- if (fis != null) {
- try {
- fis.close();
- } catch (IOException e) {
- // ignore
- }
- }
- }
-
- return fileData;
- }
-
- /**
- * Returns the contents of the file as a String, using the specified
- * encoding. This method uses {@link #get()} to retrieve the
- * contents of the file.
- *
- * @param charset The charset to use.
- *
- * @return The contents of the file, as a string.
- *
- * @throws UnsupportedEncodingException if the requested character
- * encoding is not available.
- */
- public String getString(final String charset)
- throws UnsupportedEncodingException {
- return new String(get(), charset);
- }
-
- /**
- * Returns the contents of the file as a String, using the default
- * character encoding. This method uses {@link #get()} to retrieve the
- * contents of the file.
- *
- * <b>TODO</b> Consider making this method throw UnsupportedEncodingException.
- *
- * @return The contents of the file, as a string.
- */
- public String getString() {
- byte[] rawdata = get();
- String charset = getCharSet();
- if (charset == null) {
- charset = DEFAULT_CHARSET;
- }
- try {
- return new String(rawdata, charset);
- } catch (UnsupportedEncodingException e) {
- return new String(rawdata);
- }
- }
-
- /**
- * A convenience method to write an uploaded item to disk. The client code
- * is not concerned with whether or not the item is stored in memory, or on
- * disk in a temporary location. They just want to write the uploaded item
- * to a file.
- * <p>
- * This implementation first attempts to rename the uploaded item to the
- * specified destination file, if the item was originally written to disk.
- * Otherwise, the data will be copied to the specified file.
- * <p>
- * This method is only guaranteed to work <em>once</em>, the first time it
- * is invoked for a particular item. This is because, in the event that the
- * method renames a temporary file, that file will no longer be available
- * to copy or rename again at a later time.
- *
- * @param file The <code>File</code> into which the uploaded item should
- * be stored.
- *
- * @throws Exception if an error occurs.
- */
- public void write(File file) throws Exception {
- if (isInMemory()) {
- FileOutputStream fout = null;
- try {
- fout = new FileOutputStream(file);
- fout.write(get());
- } finally {
- if (fout != null) {
- fout.close();
- }
- }
- } else {
- File outputFile = getStoreLocation();
- if (outputFile != null) {
- // Save the length of the file
- size = outputFile.length();
- /*
- * The uploaded file is being stored on disk
- * in a temporary location so move it to the
- * desired file.
- */
- if (!outputFile.renameTo(file)) {
- BufferedInputStream in = null;
- BufferedOutputStream out = null;
- try {
- in = new BufferedInputStream(
- new FileInputStream(outputFile));
- out = new BufferedOutputStream(
- new FileOutputStream(file));
- IOUtils.copy(in, out);
- } finally {
- if (in != null) {
- try {
- in.close();
- } catch (IOException e) {
- // ignore
- }
- }
- if (out != null) {
- try {
- out.close();
- } catch (IOException e) {
- // ignore
- }
- }
- }
- }
- } else {
- /*
- * For whatever reason we cannot write the
- * file to disk.
- */
- throw new FileUploadException(
- "Cannot write uploaded file to disk!");
- }
- }
- }
-
- /**
- * Deletes the underlying storage for a file item, including deleting any
- * associated temporary disk file. Although this storage will be deleted
- * automatically when the <code>FileItem</code> instance is garbage
- * collected, this method can be used to ensure that this is done at an
- * earlier time, thus preserving system resources.
- */
- public void delete() {
- cachedContent = null;
- File outputFile = getStoreLocation();
- if (outputFile != null && outputFile.exists()) {
- outputFile.delete();
- }
- }
-
- /**
- * Returns the name of the field in the multipart form corresponding to
- * this file item.
- *
- * @return The name of the form field.
- *
- * @see #setFieldName(java.lang.String)
- *
- */
- public String getFieldName() {
- return fieldName;
- }
-
- /**
- * Sets the field name used to reference this file item.
- *
- * @param fieldName The name of the form field.
- *
- * @see #getFieldName()
- *
- */
- public void setFieldName(String fieldName) {
- this.fieldName = fieldName;
- }
-
- /**
- * Determines whether or not a <code>FileItem</code> instance represents
- * a simple form field.
- *
- * @return <code>true</code> if the instance represents a simple form
- * field; <code>false</code> if it represents an uploaded file.
- *
- * @see #setFormField(boolean)
- *
- */
- public boolean isFormField() {
- return isFormField;
- }
-
- /**
- * Specifies whether or not a <code>FileItem</code> instance represents
- * a simple form field.
- *
- * @param state <code>true</code> if the instance represents a simple form
- * field; <code>false</code> if it represents an uploaded file.
- *
- * @see #isFormField()
- *
- */
- public void setFormField(boolean state) {
- isFormField = state;
- }
-
- /**
- * Returns an {@link java.io.OutputStream OutputStream} that can
- * be used for storing the contents of the file.
- *
- * @return An {@link java.io.OutputStream OutputStream} that can be used
- * for storing the contensts of the file.
- *
- * @throws IOException if an error occurs.
- */
- public OutputStream getOutputStream()
- throws IOException {
- if (dfos == null) {
- File outputFile = getTempFile();
- dfos = new DeferredFileOutputStream(sizeThreshold, outputFile);
- }
- return dfos;
- }
-
- // --------------------------------------------------------- Public methods
-
- /**
- * Returns the {@link java.io.File} object for the <code>FileItem</code>'s
- * data's temporary location on the disk. Note that for
- * <code>FileItem</code>s that have their data stored in memory,
- * this method will return <code>null</code>. When handling large
- * files, you can use {@link java.io.File#renameTo(java.io.File)} to
- * move the file to new location without copying the data, if the
- * source and destination locations reside within the same logical
- * volume.
- *
- * @return The data file, or <code>null</code> if the data is stored in
- * memory.
- */
- public File getStoreLocation() {
- if (dfos == null) {
- return null;
- }
- return dfos.getFile();
- }
-
- // ------------------------------------------------------ Protected methods
-
- /**
- * Removes the file contents from the temporary storage.
- */
- @Override
- protected void finalize() {
- File outputFile = dfos.getFile();
-
- if (outputFile != null && outputFile.exists()) {
- outputFile.delete();
- }
- }
-
- /**
- * Creates and returns a {@link java.io.File File} representing a uniquely
- * named temporary file in the configured repository path. The lifetime of
- * the file is tied to the lifetime of the <code>FileItem</code> instance;
- * the file will be deleted when the instance is garbage collected.
- *
- * @return The {@link java.io.File File} to be used for temporary storage.
- */
- protected File getTempFile() {
- if (tempFile == null) {
- File tempDir = repository;
- if (tempDir == null) {
- tempDir = new File(System.getProperty("java.io.tmpdir"));
- }
-
- String tempFileName = format("upload_%s_%s.tmp", UID, getUniqueId());
-
- tempFile = new File(tempDir, tempFileName);
- }
- return tempFile;
- }
-
- // -------------------------------------------------------- Private methods
-
- /**
- * Returns an identifier that is unique within the class loader used to
- * load this class, but does not have random-like apearance.
- *
- * @return A String with the non-random looking instance identifier.
- */
- private static String getUniqueId() {
- final int limit = 100000000;
- int current = COUNTER.getAndIncrement();
- String id = Integer.toString(current);
-
- // If you manage to get more than 100 million of ids, you'll
- // start getting ids longer than 8 characters.
- if (current < limit) {
- id = ("00000000" + id).substring(id.length());
- }
- return id;
- }
-
- /**
- * Returns a string representation of this object.
- *
- * @return a string representation of this object.
- */
- @Override
- public String toString() {
- return format("name=%s, StoreLocation=%s, size=%s bytes, isFormField=%s, FieldName=%s",
- getName(), getStoreLocation(), Long.valueOf(getSize()),
- Boolean.valueOf(isFormField()), getFieldName());
- }
-
- // -------------------------------------------------- Serialization methods
-
- /**
- * Writes the state of this object during serialization.
- *
- * @param out The stream to which the state should be written.
- *
- * @throws IOException if an error occurs.
- */
- private void writeObject(ObjectOutputStream out) throws IOException {
- // Read the data
- if (dfos.isInMemory()) {
- cachedContent = get();
- } else {
- cachedContent = null;
- dfosFile = dfos.getFile();
- }
-
- // write out values
- out.defaultWriteObject();
- }
-
- /**
- * Reads the state of this object during deserialization.
- *
- * @param in The stream from which the state should be read.
- *
- * @throws IOException if an error occurs.
- * @throws ClassNotFoundException if class cannot be found.
- */
- private void readObject(ObjectInputStream in)
- throws IOException, ClassNotFoundException {
- // read values
- in.defaultReadObject();
-
- /* One expected use of serialization is to migrate HTTP sessions
- * containing a DiskFileItem between JVMs. Particularly if the JVMs are
- * on different machines It is possible that the repository location is
- * not valid so validate it.
- */
- if (repository != null) {
- if (repository.isDirectory()) {
- // Check path for nulls
- if (repository.getPath().contains("\0")) {
- throw new IOException(format(
- "The repository [%s] contains a null character",
- repository.getPath()));
- }
- } else {
- throw new IOException(format(
- "The repository [%s] is not a directory",
- repository.getAbsolutePath()));
- }
- }
-
- OutputStream output = getOutputStream();
- if (cachedContent != null) {
- output.write(cachedContent);
- } else if (dfosFile.exists()) {
- FileInputStream input = new FileInputStream(dfosFile);
- IOUtils.copy(input, output);
- input.close();
- dfosFile.delete();
- dfosFile = null;
- }
- output.close();
-
- cachedContent = null;
- }
-
- /**
- * Returns the file item headers.
- * @return The file items headers.
- */
- public FileItemHeaders getHeaders() {
- return headers;
- }
-
- /**
- * Sets the file item headers.
- * @param pHeaders The file items headers.
- */
- public void setHeaders(FileItemHeaders pHeaders) {
- headers = pHeaders;
- }
-
-}