p05617423
/
bench4q
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of https://github.com/lostcharlie/Bench4Q

This commit is contained in:
liuchongrui 2014-09-25 14:50:40 +08:00
parent 259fe8caa0 d461e5f325
commit 810bfe7c15
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Bench4Q-Master/src/main/java/org/bench4q/master/domain/entity/TestPlan.java
View File

@ -263,7 +263,7 @@ public class TestPlan implements IAggregate {
} }
//start monitor to check the limit //start monitor to check the limit
UUID testPlanIdUuid = UUID.fromString(this.testPlanRunId); UUID testPlanIdUuid = UUID.fromString(this.testPlanRunId);
if (getMonitors() != null) { if (getMonitors() != null && this.limitModel != null) {
for (Monitor monitor : getMonitors()) { for (Monitor monitor : getMonitors()) {
monitor.start(testPlanIdUuid, this.limitModel); monitor.start(testPlanIdUuid, this.limitModel);
} }

1
Bench4Q-Master/src/main/java/org/bench4q/master/domain/service/TestPlanEngine.java
View File

@ -141,6 +141,7 @@ public class TestPlanEngine implements TaskCompleteCallback,
+ testPlanId.toString()); + testPlanId.toString());
return; return;
} }
testPlan.addObserver(this);
testPlan.run(); testPlan.run();
this.getTestPlanRepository().attachRunningTestPlan(testPlan); this.getTestPlanRepository().attachRunningTestPlan(testPlan);
} }