Skip to content

Commit d3e55e4

Browse files
committed
resolve errors after rebase on main
- reset() - removed with issue#3328 - remove deprecated code from issue#907 (#3395)
1 parent 1ec37ab commit d3e55e4

File tree

2 files changed

+0
-19
lines changed

2 files changed

+0
-19
lines changed

src/main/java/io/lettuce/core/protocol/MaintenanceAwareExpiryWriter.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -102,12 +102,6 @@ public <K, V, T> RedisCommand<K, V, T> write(RedisCommand<K, V, T> command) {
102102
return delegate.write(redisCommands);
103103
}
104104

105-
@Override
106-
public void reset() {
107-
relaxTimeouts = false;
108-
super.reset();
109-
}
110-
111105
private void potentiallyExpire(RedisCommand<?, ?, ?> command, ScheduledExecutorService executors) {
112106

113107
long timeout = applyConnectionTimeout ? this.timeout : source.getTimeout(command);

src/test/java/io/lettuce/core/protocol/MaintenanceAwareExpiryWriterUnitTests.java

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -234,19 +234,6 @@ void testRegisterAsMaintenanceAwareComponentWithNullChannel() {
234234
verifyNoInteractions(watchdog);
235235
}
236236

237-
@Test
238-
void testReset() {
239-
// Given
240-
setField(writer, "relaxTimeouts", true);
241-
242-
// When
243-
writer.reset();
244-
245-
// Then
246-
verify(delegate).reset();
247-
// Verify that relaxTimeouts and registered flags are reset (tested indirectly)
248-
}
249-
250237
@Test
251238
void testOnRebindStarted() {
252239
// When

0 commit comments

Comments
 (0)