From ec7f54809fa5e9c862a734b7dd57305b58da018c Mon Sep 17 00:00:00 2001 From: redkale Date: Wed, 4 Sep 2024 22:54:18 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/org/redkale/net/Response.java | 4 ++-- src/main/java/org/redkale/net/http/HttpRequest.java | 2 +- src/main/java/org/redkale/net/http/HttpResponse.java | 2 +- src/main/java/org/redkale/net/sncp/SncpRequest.java | 5 ++--- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/redkale/net/Response.java b/src/main/java/org/redkale/net/Response.java index 0dd852bb2..3be2f15ad 100644 --- a/src/main/java/org/redkale/net/Response.java +++ b/src/main/java/org/redkale/net/Response.java @@ -214,7 +214,7 @@ public abstract class Response> { inNonBlocking = false; workExecutor.execute(() -> { try { - f.doFilter(request, Response.this); + f.doFilter(request, this); } catch (Throwable t) { context.getLogger().log(Level.WARNING, "Filter occur exception. request = " + request, t); finishError(t); @@ -236,7 +236,7 @@ public abstract class Response> { inNonBlocking = false; workExecutor.execute(() -> { try { - s.execute(request, Response.this); + s.execute(request, this); } catch (Throwable t) { context.getLogger().log(Level.WARNING, "Servlet occur exception. request = " + request, t); finishError(t); diff --git a/src/main/java/org/redkale/net/http/HttpRequest.java b/src/main/java/org/redkale/net/http/HttpRequest.java index 1f83fc0cb..db7b43d49 100644 --- a/src/main/java/org/redkale/net/http/HttpRequest.java +++ b/src/main/java/org/redkale/net/http/HttpRequest.java @@ -1247,7 +1247,7 @@ public class HttpRequest extends Request { } @Override - protected Serializable getRequestid() { + protected final Serializable getRequestid() { return null; } diff --git a/src/main/java/org/redkale/net/http/HttpResponse.java b/src/main/java/org/redkale/net/http/HttpResponse.java index 1a947f7ea..acddea1d4 100644 --- a/src/main/java/org/redkale/net/http/HttpResponse.java +++ b/src/main/java/org/redkale/net/http/HttpResponse.java @@ -858,7 +858,7 @@ public class HttpResponse extends Response { } else if (val instanceof CompletionStage) { finishFuture(convert, val == obj ? type : null, (CompletionStage) val); } else if (val instanceof CharSequence) { - finish((String) val.toString()); + finish(val.toString()); } else if (val instanceof byte[]) { finish((byte[]) val); } else if (val instanceof File) { diff --git a/src/main/java/org/redkale/net/sncp/SncpRequest.java b/src/main/java/org/redkale/net/sncp/SncpRequest.java index 75989d256..f0968f853 100644 --- a/src/main/java/org/redkale/net/sncp/SncpRequest.java +++ b/src/main/java/org/redkale/net/sncp/SncpRequest.java @@ -5,8 +5,6 @@ */ package org.redkale.net.sncp; -import static org.redkale.net.client.ClientRequest.EMPTY_TRACEID; - import java.io.Serializable; import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; @@ -15,6 +13,7 @@ import java.util.logging.Level; import org.redkale.convert.*; import org.redkale.convert.bson.BsonReader; import org.redkale.net.Request; +import static org.redkale.net.client.ClientRequest.EMPTY_TRACEID; import org.redkale.util.*; /** @@ -159,7 +158,7 @@ public class SncpRequest extends Request { } @Override - protected Serializable getRequestid() { + protected final Serializable getRequestid() { return header.getSeqid(); }