Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '6.1.x'

Browse Source 
# Conflicts:
#	framework-platform/framework-platform.gradle
#	spring-web/src/main/java/org/springframework/http/client/reactive/JettyClientHttpConnector.java
This commit is contained in:
Juergen Hoeller
2024-11-13 15:12:55 +01:00
parent d92c57f7a5 14b9865de7
commit 25e2c1b7ce
5 changed files with 17 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/JettyWebSocketHandlerAdapter.java
View File

@@ -287,48 +287,18 @@ public class JettyWebSocketHandlerAdapter implements Session.Listener {
@Override
public ByteBufferIterator readableByteBuffers() {
ByteBufferIterator delegateIterator = this.delegate.readableByteBuffers();
return new JettyByteBufferIterator(delegateIterator);
return this.delegate.readableByteBuffers();
}
@Override
public ByteBufferIterator writableByteBuffers() {
ByteBufferIterator delegateIterator = this.delegate.writableByteBuffers();
return new JettyByteBufferIterator(delegateIterator);
return this.delegate.writableByteBuffers();
}
@Override
public String toString(int index, int length, Charset charset) {
return this.delegate.toString(index, length, charset);
}
private static class JettyByteBufferIterator implements ByteBufferIterator {
private final ByteBufferIterator delegate;
JettyByteBufferIterator(ByteBufferIterator delegate) {
Assert.notNull(delegate, "Delegate must not be null");
this.delegate = delegate;
}
@Override
public void close() {
this.delegate.close();
}
@Override
public boolean hasNext() {
return this.delegate.hasNext();
}
@Override
public ByteBuffer next() {
return this.delegate.next();
}
}
}
}