You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by al...@apache.org on 2014/11/26 12:27:10 UTC
[1/2] incubator-brooklyn git commit: Fix
BrooklynMementoPersisterToMultiFileTest.tearDown
Repository: incubator-brooklyn
Updated Branches:
refs/heads/master c2f2396bd -> 791d1f1d8
Fix BrooklynMementoPersisterToMultiFileTest.tearDown
- stop management context before deleting mementoDir, otherwise
the management context can be reading/writing to dir at same time
as we are trying to delete its contents.
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/eff815d8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/eff815d8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/eff815d8
Branch: refs/heads/master
Commit: eff815d85dc07965ecda475172284098ce7255ba
Parents: 0f50c58
Author: Aled Sage <al...@gmail.com>
Authored: Wed Nov 26 11:25:03 2014 +0000
Committer: Aled Sage <al...@gmail.com>
Committed: Wed Nov 26 11:25:03 2014 +0000
----------------------------------------------------------------------
.../rebind/persister/BrooklynMementoPersisterToMultiFileTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/eff815d8/core/src/test/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterToMultiFileTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterToMultiFileTest.java b/core/src/test/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterToMultiFileTest.java
index 5449791..d2fe7a6 100644
--- a/core/src/test/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterToMultiFileTest.java
+++ b/core/src/test/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterToMultiFileTest.java
@@ -54,8 +54,8 @@ public class BrooklynMementoPersisterToMultiFileTest extends BrooklynMementoPers
@AfterMethod(alwaysRun=true)
public void tearDown() throws Exception {
- mementoDir = Os.deleteRecursively(mementoDir).asNullOrThrowing();
super.tearDown();
+ mementoDir = Os.deleteRecursively(mementoDir).asNullOrThrowing();
}
// to have this picked up in the IDE
[2/2] incubator-brooklyn git commit: This closes #361
Posted by al...@apache.org.
This closes #361
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/791d1f1d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/791d1f1d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/791d1f1d
Branch: refs/heads/master
Commit: 791d1f1d8868332f1422ebc97f22d144336a9e78
Parents: c2f2396 eff815d
Author: Aled Sage <al...@gmail.com>
Authored: Wed Nov 26 11:27:01 2014 +0000
Committer: Aled Sage <al...@gmail.com>
Committed: Wed Nov 26 11:27:01 2014 +0000
----------------------------------------------------------------------
.../rebind/persister/BrooklynMementoPersisterToMultiFileTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------