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/05 01:21:37 UTC
[7/8] git commit: Fix testTestJavaWebAppEntityStarts
Fix testTestJavaWebAppEntityStarts
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/2bf6c6bd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/2bf6c6bd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/2bf6c6bd
Branch: refs/heads/master
Commit: 2bf6c6bd4940bf02e7413dece5695272e9ff12bd
Parents: 85d2f02
Author: Aled Sage <al...@gmail.com>
Authored: Wed Nov 5 00:18:24 2014 +0000
Committer: Aled Sage <al...@gmail.com>
Committed: Wed Nov 5 00:18:24 2014 +0000
----------------------------------------------------------------------
.../test/java/brooklyn/test/entity/TestJavaWebAppEntityImpl.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2bf6c6bd/software/webapp/src/test/java/brooklyn/test/entity/TestJavaWebAppEntityImpl.java
----------------------------------------------------------------------
diff --git a/software/webapp/src/test/java/brooklyn/test/entity/TestJavaWebAppEntityImpl.java b/software/webapp/src/test/java/brooklyn/test/entity/TestJavaWebAppEntityImpl.java
index ea7e440..579763d 100644
--- a/software/webapp/src/test/java/brooklyn/test/entity/TestJavaWebAppEntityImpl.java
+++ b/software/webapp/src/test/java/brooklyn/test/entity/TestJavaWebAppEntityImpl.java
@@ -51,6 +51,7 @@ public class TestJavaWebAppEntityImpl extends VanillaJavaAppImpl implements Test
public void start(java.util.Collection<? extends Location> locations) {
ServiceStateLogic.setExpectedState(entity(), Lifecycle.STARTING);
LOG.trace("Starting {}", this);
+ entity().setAttribute(SERVICE_PROCESS_IS_RUNNING, true);
entity().setAttribute(Attributes.SERVICE_UP, true);
ServiceStateLogic.setExpectedState(entity(), Lifecycle.RUNNING);
}
@@ -58,6 +59,7 @@ public class TestJavaWebAppEntityImpl extends VanillaJavaAppImpl implements Test
ServiceStateLogic.setExpectedState(entity(), Lifecycle.STOPPING);
LOG.trace("Stopping {}", this);
entity().setAttribute(Attributes.SERVICE_UP, false);
+ entity().setAttribute(SERVICE_PROCESS_IS_RUNNING, false);
ServiceStateLogic.setExpectedState(entity(), Lifecycle.STOPPED);
}
};