This is an automated email from the ASF dual-hosted git repository.
mxsm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/eventmesh.git
The following commit(s) were added to refs/heads/master by this push:
new 9264a7593 [ISSUE #4196] [Enhancement] Dereference of
'subscriptionItems' may produce NPE. (#4358)
9264a7593 is described below
commit 9264a7593733d524e5f93f1e5aefad768733376b
Author: Vaibhav arya <[email protected]>
AuthorDate: Mon Aug 14 18:33:09 2023 +0530
[ISSUE #4196] [Enhancement] Dereference of 'subscriptionItems' may produce
NPE. (#4358)
* fixes issue #4196
* check style fix
---
.../core/protocol/grpc/processor/SubscribeStreamProcessor.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git
a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/grpc/processor/SubscribeStreamProcessor.java
b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/grpc/processor/SubscribeStreamProcessor.java
index 3616b31f4..aa21f5623 100644
---
a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/grpc/processor/SubscribeStreamProcessor.java
+++
b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/grpc/processor/SubscribeStreamProcessor.java
@@ -36,6 +36,7 @@ import
org.apache.eventmesh.runtime.core.protocol.grpc.service.ServiceUtils;
import java.util.Date;
import java.util.LinkedList;
import java.util.List;
+import java.util.Objects;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -51,7 +52,7 @@ public class SubscribeStreamProcessor {
private final EventMeshGrpcServer eventMeshGrpcServer;
- private final GrpcType grpcType = GrpcType.STREAM;
+ private static final GrpcType grpcType = GrpcType.STREAM;
private final Acl acl;
@@ -95,7 +96,7 @@ public class SubscribeStreamProcessor {
List<SubscriptionItem> subscriptionItems =
JsonUtils.parseTypeReferenceObject(subscription.getTextData(),
new TypeReference<List<SubscriptionItem>>() {
});
- for (SubscriptionItem item : subscriptionItems) {
+ for (SubscriptionItem item :
Objects.requireNonNull(subscriptionItems)) {
ConsumerGroupClient newClient = ConsumerGroupClient.builder()
.env(env)
.idc(idc)
@@ -148,7 +149,7 @@ public class SubscribeStreamProcessor {
List<SubscriptionItem> subscriptionItems =
JsonUtils.parseTypeReferenceObject(subscription.getTextData(),
new TypeReference<List<SubscriptionItem>>() {
});
- for (SubscriptionItem item : subscriptionItems) {
+ for (SubscriptionItem item :
Objects.requireNonNull(subscriptionItems)) {
this.acl.doAclCheckInHttpReceive(remoteAdd, user, pass,
subsystem, item.getTopic(), RequestCode.SUBSCRIBE.getRequestCode());
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
