You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2014/10/22 11:57:30 UTC
git commit: actually exportTo fails is file already exists and we
don't allow overwrite
Repository: tomee
Updated Branches:
refs/heads/develop fa39d7d35 -> 6696d5a5e
actually exportTo fails is file already exists and we don't allow overwrite
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/6696d5a5
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/6696d5a5
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/6696d5a5
Branch: refs/heads/develop
Commit: 6696d5a5ec37834c943b1e5f79a398a66793865a
Parents: fa39d7d
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Wed Oct 22 11:57:00 2014 +0200
Committer: Romain Manni-Bucau <rm...@apache.org>
Committed: Wed Oct 22 11:57:00 2014 +0200
----------------------------------------------------------------------
.../org/apache/openejb/arquillian/common/TomEEContainer.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/6696d5a5/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java
----------------------------------------------------------------------
diff --git a/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java b/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java
index 8f63b50..c82ed1f 100644
--- a/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java
+++ b/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java
@@ -353,7 +353,9 @@ public abstract class TomEEContainer<Configuration extends TomEEConfiguration> i
if (file.exists()) {
size = file.length();
}
- finalArchive.as(ZipExporter.class).exportTo(file, !configuration.isSingleDumpByArchiveName());
+ if (!configuration.isSingleDumpByArchiveName() || !file.exists()) {
+ finalArchive.as(ZipExporter.class).exportTo(file, true);
+ }
if (size > 0 && size != file.length()) {
LOGGER.warning("\nFile overwritten but size doesn't match: (now) "
+ file.length() + "/(before) " + size + " name="+ file.getName()