Skip to content
This repository was archived by the owner on Feb 18, 2024. It is now read-only.

Commit 0d47fc2

Browse files
authored
Merge pull request #435 from sofastack/yuan_master_property
Fixed the issue where the module obtains the base configuration when …
2 parents b82a9f2 + cfe20c1 commit 0d47fc2

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

sofa-serverless-runtime/arklet-core/src/main/java/com/alipay/sofa/serverless/arklet/core/api/tunnel/http/netty/NettyHttpServer.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,10 @@ protected void channelRead0(ChannelHandlerContext ctx, FullHttpRequest request)
145145
returnResponse(ctx, response);
146146
}
147147
} catch (Throwable e) {
148-
returnResponse(ctx, Response.internalError("Internal Error: " + e.getMessage(),
149-
ExceptionUtils.getStackTraceAsString(e)));
148+
returnResponse(
149+
ctx,
150+
Response.internalError("Internal Error: " + e.getMessage(),
151+
ExceptionUtils.getStackTraceAsString(e)));
150152
LOGGER.error("arklet process exception, cmd: {}", validation.getCmd(), e);
151153
}
152154
}

sofa-serverless-runtime/sofa-serverless-base-plugin/src/main/java/com/alipay/sofa/serverless/plugin/spring/MasterBizPropertySource.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,14 @@
2727
* @author: yuanyuan
2828
* @date: 2023/10/30 9:52 下午
2929
*/
30-
public class MasterBizPropertySource extends EnumerablePropertySource<Environment> {
30+
public class MasterBizPropertySource extends EnumerablePropertySource<Set<String>> {
3131

3232
private final Set<String> keys;
3333
private final Environment environment;
3434

3535
public MasterBizPropertySource(String name, @NonNull Environment environment,
3636
@NonNull Set<String> keys) {
37-
super(name, environment);
37+
super(name, keys);
3838
this.environment = environment;
3939
this.keys = keys;
4040
}

0 commit comments

Comments
 (0)