diff --git a/server/jetstream_cluster.go b/server/jetstream_cluster.go index 3cec6117..5acf7937 100644 --- a/server/jetstream_cluster.go +++ b/server/jetstream_cluster.go @@ -2724,6 +2724,18 @@ func (s *Server) jsClusteredConsumerListRequest(acc *Account, ci *ClientInfo, of defer s.sysUnsubscribe(rsub) // Send out our requests here. + var resp = JSApiConsumerListResponse{ + ApiResponse: ApiResponse{Type: JSApiConsumerListResponseType}, + Consumers: []*ConsumerInfo{}, + } + + if len(consumers) == 0 { + resp.Limit = JSApiListLimit + resp.Offset = offset + s.sendAPIResponse(ci, acc, subject, reply, string(rmsg), s.jsonResponse(resp)) + return + } + for _, ca := range consumers { isubj := fmt.Sprintf(clusterConsumerInfoT, ca.Client.Account, stream, ca.Name) s.sendInternalMsgLocked(isubj, inbox, nil, nil) @@ -2733,11 +2745,6 @@ func (s *Server) jsClusteredConsumerListRequest(acc *Account, ci *ClientInfo, of notActive := time.NewTimer(timeout) defer notActive.Stop() - var resp = JSApiConsumerListResponse{ - ApiResponse: ApiResponse{Type: JSApiConsumerListResponseType}, - Consumers: []*ConsumerInfo{}, - } - LOOP: for { select {