You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2016/10/21 07:05:06 UTC
cayenne git commit: CAY-2119 ProjectUpgrader test failure (Windows)
Repository: cayenne
Updated Branches:
refs/heads/master f72210ccb -> b0739e1b6
CAY-2119 ProjectUpgrader test failure (Windows)
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/b0739e1b
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/b0739e1b
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/b0739e1b
Branch: refs/heads/master
Commit: b0739e1b6969eef75252040edc9a5e8488c80f5c
Parents: f72210c
Author: Andrus Adamchik <an...@objectstyle.com>
Authored: Fri Oct 21 10:04:19 2016 +0300
Committer: Andrus Adamchik <an...@objectstyle.com>
Committed: Fri Oct 21 10:04:46 2016 +0300
----------------------------------------------------------------------
.../main/java/org/apache/cayenne/project/FileProjectSaver.java | 4 ++++
docs/doc/src/main/resources/RELEASE-NOTES.txt | 1 +
2 files changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b0739e1b/cayenne-project/src/main/java/org/apache/cayenne/project/FileProjectSaver.java
----------------------------------------------------------------------
diff --git a/cayenne-project/src/main/java/org/apache/cayenne/project/FileProjectSaver.java b/cayenne-project/src/main/java/org/apache/cayenne/project/FileProjectSaver.java
index 5b22b08..e92c0a3 100644
--- a/cayenne-project/src/main/java/org/apache/cayenne/project/FileProjectSaver.java
+++ b/cayenne-project/src/main/java/org/apache/cayenne/project/FileProjectSaver.java
@@ -207,6 +207,10 @@ public class FileProjectSaver implements ProjectSaver {
File targetFile = unit.targetFile;
+ // Per CAY-2119, this is an ugly hack to force Windows to unlock the file that was previously locked by
+ // our process. Without it, the delete operation downstream would fail
+ System.gc();
+
if (targetFile.exists()) {
if (!targetFile.delete()) {
throw new CayenneRuntimeException("Unable to remove old master file '%s'",
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b0739e1b/docs/doc/src/main/resources/RELEASE-NOTES.txt
----------------------------------------------------------------------
diff --git a/docs/doc/src/main/resources/RELEASE-NOTES.txt b/docs/doc/src/main/resources/RELEASE-NOTES.txt
index d4636fc..b8811de 100644
--- a/docs/doc/src/main/resources/RELEASE-NOTES.txt
+++ b/docs/doc/src/main/resources/RELEASE-NOTES.txt
@@ -54,6 +54,7 @@ CAY-2101 DataContext.currentSnapshot() doesn't set snapshot entity name
CAY-2105 Add missing elements to the reverseEngineering.xsd
CAY-2108 cayenne-di: StackOverflow for decorator that takes Provider of the delegate
CAY-2110 Obfuscated exception when processing iterated results
+CAY-2119 ProjectUpgrader test failure (Windows)
CAY-2122 Vertical Inheritance: Cannot Insert Record For Implementing Class with Attribute And Relationship
----------------------------------