Build: #15 was successful Changes by Urs Keller <[email protected]>

Build result summary

Details

Completed
Duration
1 minute
Labels
None
Agent
bamboo-18.af.pivotal.io
Revision
7f135baa95016c0413fefc0a027fd27ee90e28f8 7f135baa95016c0413fefc0a027fd27ee90e28f8
Total tests
32
Successful since
#14 ()

Tests

  • 0 New failures
  • 0 Existing failures
  • 0 Fixed

Code commits

Author Commit Message Commit date
Urs Keller <urs@revault.ch> Urs Keller <[email protected]> 7f135baa95016c0413fefc0a027fd27ee90e28f8 7f135baa95016c0413fefc0a027fd27ee90e28f8 Fix NPE for retryTemp!=null but recoveryCall==null
Starting with version `3.0.x`, the `KafkaInboundGateway` and
`KafkaMessageDrivenChannelAdapter` rely on the
`RetryContext.getRetryCount()` for the
`IntegrationMessageHeaderAccessor.DELIVERY_ATTEMPT` message header, but
the `RetryContext` is obtained from the `TheadLocal` `attributesHolder`,
which is populated from the `RetryListener.open()` only if
`recoveryCallback != null`

* Fix `KafkaInboundGateway` and `KafkaMessageDrivenChannelAdapter` to
populate `TheadLocal` `attributesHolder` with the `RetryContext`
from the `RetryListener.open()` when only `retryTemplate != null`

**Cherry-pick to `master` & 3.0.x**

# Conflicts:
#        src/test/java/org/springframework/integration/kafka/inbound/InboundGatewayTests.java
#        src/test/java/org/springframework/integration/kafka/inbound/MessageDrivenAdapterTests.java