ben-manes / caffeine / #5698

100%

master: 100%

Build Type

push

github

Committed by ben-manes

Commit Message

Fix minor defects found by a review sweep

- Prefer the operation's own failure over a throwing synchronous jcache
  listener's, retaining the latter as suppressed. awaitSynchronous()
  became throwing, so putAll, removeAll, invoke, and LoadingCacheProxy's
  get and getAll discarded the writer, loader, or entry processor
  failure that the specification requires the caller to observe.
- Chain the per-key dispatch queue with handleAsync so that a
  predecessor which completed exceptionally, as dispatch rethrows an
  Error, cannot suppress the next event's delivery. thenApplyAsync
  relayed the throwable and silently never invoked the listener, losing
  a same-key event. The predecessor's failure is still observed through
  the pending list, which holds each synchronous event's own future.
- Guard the synchronous listener exception fold against self-
  suppression, as a listener that rethrows a stored exception yields the
  same instance for two events and Throwable.addSuppressed then throws,
  masking the failure it was folding. Restore awaitSynchronous()'s fast
  path for when nothing is pending, which delegating to
  chainSynchronous() had dropped.
- Span the CompletionListener notification with loadAll's tracked future
  so that close() awaits the callback rather than returning while it is
  still queued, and clear the pending synchronous futures in a finally
  so an Error cannot strand them for the next load to join and
  misreport. The notification is composed onto the load rather than
  joined, as its dispatches run on the executor that the load itself
  occupies.
- Unregister the JMX beans before destroyCache frees the cache name, as
  otherwise a same-named replacement cache's beans are unregistered
  instead, and route them through the toggles so that the statistics and
  configuration flags are applied and a failing unregistration is
  aggregated rather than aborting the close. Share the suppression logic
  as suppress(), which tolerates a nu... (continued)

Coverage Stats

4221 of 4239 branches covered (99.58%)

83 of 88 new or added lines in 7 files covered. (94.32%)

1 existing line in 1 file now uncovered.

8523 of 8530 relevant lines covered (99.92%)

1.0 hits per line