unlock should always return TargetLock 87/55887/1
authorJim Hahn <jrh3@att.com>
Thu, 5 Jul 2018 14:36:49 +0000 (10:36 -0400)
committerJim Hahn <jrh3@att.com>
Thu, 5 Jul 2018 14:36:49 +0000 (10:36 -0400)
commit48dcb76d2895029d72298b0f81eb0cff71a4ea69
treed427a5e6a11da3e509dc145d078428ec7d601f90
parentcecd4ac43f199ad9f020d38fb7d1651b296d1703
unlock should always return TargetLock

ControlLoopEventManager.unlock only returns the TargetLock if
the PolicyGuard.unlock operation is successful.  However, if
the lock has already expired, then PolicyGuard.unlock will return
false, and ControlLoopEventManager.unlock will then return null.
As a result, the rules do not retract the TargetLock.  (The rules
do, however, retract any left-over TargetLock objects during the
clean-up phase.  Nevertheless, the earlier rules should not have
to depend on the clean-up rules to do that.)
Modified the code to address this issue.

Change-Id: I2e6099a4e3511053d2e6e1373cae4b480798d1b6
Issue-ID: POLICY-872
Signed-off-by: Jim Hahn <jrh3@att.com>
controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/ControlLoopEventManager.java
controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/eventmanager/ControlLoopEventManagerTest.java