You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2022/02/23 14:38:42 UTC
[brooklyn-server] branch master updated: add fix for adjunct leak
This is an automated email from the ASF dual-hosted git repository.
heneveld pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git
The following commit(s) were added to refs/heads/master by this push:
new 58c4a4c add fix for adjunct leak
58c4a4c is described below
commit 58c4a4cc506a99328edf9b2d50f60be1b925f3a5
Author: Alex Heneveld <al...@cloudsoftcorp.com>
AuthorDate: Wed Feb 23 14:38:17 2022 +0000
add fix for adjunct leak
an extra notification that something is removed -- all tests pass
---
.../java/org/apache/brooklyn/core/objs/AbstractEntityAdjunct.java | 1 +
.../org/apache/brooklyn/entity/group/DynamicMultiGroupRebindTest.java | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/core/src/main/java/org/apache/brooklyn/core/objs/AbstractEntityAdjunct.java b/core/src/main/java/org/apache/brooklyn/core/objs/AbstractEntityAdjunct.java
index 62b40a6..8493e80 100644
--- a/core/src/main/java/org/apache/brooklyn/core/objs/AbstractEntityAdjunct.java
+++ b/core/src/main/java/org/apache/brooklyn/core/objs/AbstractEntityAdjunct.java
@@ -432,6 +432,7 @@ public abstract class AbstractEntityAdjunct extends AbstractBrooklynObject imple
destroyed.set(true);
SubscriptionTracker tracker = getSubscriptionTracker();
if (tracker != null) tracker.unsubscribeAll();
+ getManagementContext().getRebindManager().getChangeListener().onUnmanaged(this);
}
@Override
diff --git a/core/src/test/java/org/apache/brooklyn/entity/group/DynamicMultiGroupRebindTest.java b/core/src/test/java/org/apache/brooklyn/entity/group/DynamicMultiGroupRebindTest.java
index 7d2866f..cf37e24 100644
--- a/core/src/test/java/org/apache/brooklyn/entity/group/DynamicMultiGroupRebindTest.java
+++ b/core/src/test/java/org/apache/brooklyn/entity/group/DynamicMultiGroupRebindTest.java
@@ -125,7 +125,7 @@ public class DynamicMultiGroupRebindTest extends RebindTestFixtureWithApp {
}
}
- @Test(groups="Broken") // bug we are fixing
+ @Test
public void testSimplestMultiGroupRebindAndDelete() throws Exception {
DynamicMultiGroup dmg = origApp.createAndManageChild(EntitySpec.create(DynamicMultiGroup.class)
.configure(DynamicMultiGroup.ENTITY_FILTER, Predicates.alwaysFalse())
@@ -156,7 +156,7 @@ public class DynamicMultiGroupRebindTest extends RebindTestFixtureWithApp {
if ( MutableSet.of("planeId").contains(f.getName()) ) {
// expect these
} else {
- Assert.fail("At least one file exists after deployment: " + f);
+ Assert.fail("At least one unexpected file exists after app stopped: " + f);
}
}
});