@@ -1454,10 +1454,19 @@ protected void shutdownBasicService() {
14541454 this .popConsumerService .shutdown ();
14551455 }
14561456
1457- {
1457+ if ( this . popMessageProcessor . getPopLongPollingService () != null ) {
14581458 this .popMessageProcessor .getPopLongPollingService ().shutdown ();
1459+ }
1460+
1461+ if (this .popMessageProcessor .getQueueLockManager () != null ) {
14591462 this .popMessageProcessor .getQueueLockManager ().shutdown ();
1463+ }
1464+
1465+ if (this .popMessageProcessor .getPopBufferMergeService () != null ) {
14601466 this .popMessageProcessor .getPopBufferMergeService ().shutdown ();
1467+ }
1468+
1469+ if (this .ackMessageProcessor .getPopReviveServices () != null ) {
14611470 this .ackMessageProcessor .shutdownPopReviveService ();
14621471 }
14631472
@@ -1572,7 +1581,7 @@ protected void shutdownBasicService() {
15721581 }
15731582
15741583 if (this .escapeBridge != null ) {
1575- escapeBridge .shutdown ();
1584+ this . escapeBridge .shutdown ();
15761585 }
15771586
15781587 if (this .topicRouteInfoManager != null ) {
@@ -1609,8 +1618,13 @@ protected void shutdownBasicService() {
16091618 this .consumerOffsetManager .stop ();
16101619 }
16111620
1612- if (null != configStorage ) {
1613- configStorage .shutdown ();
1621+ if (this .consumerOrderInfoManager != null ) {
1622+ this .consumerOrderInfoManager .persist ();
1623+ this .consumerOrderInfoManager .shutdown ();
1624+ }
1625+
1626+ if (this .configStorage != null ) {
1627+ this .configStorage .shutdown ();
16141628 }
16151629
16161630 if (this .authenticationMetadataManager != null ) {
0 commit comments