cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject [2/2] git commit: updated refs/heads/4.6 to 9960593
Date Fri, 27 Nov 2015 21:55:52 GMT
Merge pull request #1127 from greenqloud/pr-eventbus-uuids-4.6

Fix event UUIDS missing on event busSame as pull request #1111, but this time on the 4.6 branch
for forward merging in accordance with [the wiki](https://cwiki.apache.org/confluence/display/CLOUDSTACK/Release+principles+for+Apache+CloudStack+4.6+and+up#ReleaseprinciplesforApacheCloudStack4.6andup-HowtomergeaPullRequest?).

The fixing of CLOUDSTACK-8816 introduced a regression that removed the first class entities
in the event bus description property. This is because everything was changed to use the Class
as a key... Everything but the populateFirstClassEntities method in ActionEventUtils.

This commit tries to load the class key instead of the String key, which re-enables the populateFirstClassEntities
method.

Likely this was not caught because of the trace exception handling... maybe some better logging/unit
tests would be good for this PR.

* pr/1127:
  Fix event UUIDS missing on event bus

Signed-off-by: Daan Hoogland <daan@onecht.net>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/99605938
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/99605938
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/99605938

Branch: refs/heads/4.6
Commit: 99605938938ab514a3c0bb596348de2e8e598c72
Parents: 92913a1 7d44e90
Author: Daan Hoogland <daan@onecht.net>
Authored: Fri Nov 27 22:54:48 2015 +0100
Committer: Daan Hoogland <daan@onecht.net>
Committed: Fri Nov 27 22:54:48 2015 +0100

----------------------------------------------------------------------
 .../src/com/cloud/event/ActionEventUtils.java   |   3 +-
 .../com/cloud/event/ActionEventUtilsTest.java   | 213 +++++++++++++++++++
 2 files changed, 214 insertions(+), 2 deletions(-)
----------------------------------------------------------------------



Mime
View raw message