mattrpav commented on code in PR #1484:
URL: https://github.com/apache/activemq/pull/1484#discussion_r3904873735
##########
activemq-broker/src/main/java/org/apache/activemq/broker/region/BaseDestination.java:
##########
@@ -796,19 +828,37 @@ public boolean isGcWithNetworkConsumers() {
return gcWithNetworkConsumers;
}
+ /**
+ * Indicate if it is ok to gc destinations that have only wildcard
consumers
+ * @param gcWithOnlyWildcardConsumers
+ */
+ public void setGcWithOnlyWildcardConsumers(boolean
gcWithOnlyWildcardConsumers) {
+ this.gcWithOnlyWildcardConsumers = gcWithOnlyWildcardConsumers;
+ }
+
+ public boolean isGcWithOnlyWildcardConsumers() {
+ return gcWithOnlyWildcardConsumers;
+ }
+
@Override
public void markForGC(long timeStamp) {
- if (isGcIfInactive() && this.lastActiveTime == 0 && isActive() == false
- && destinationStatistics.getMessages().getCount() == 0 &&
getInactiveTimeoutBeforeGC() > 0l) {
+ if (isGcIfInactive()
+ && this.lastActiveTime == 0
+ && destinationStatistics.getMessages().getCount() == 0
+ && getInactiveTimeoutBeforeGC() > 0L
+ && !isActive()) {
this.lastActiveTime = timeStamp;
}
}
@Override
public boolean canGC() {
- boolean result = false;
- final long currentLastActiveTime = this.lastActiveTime;
- if (isGcIfInactive() && currentLastActiveTime != 0l &&
destinationStatistics.getMessages().getCount() == 0L ) {
+ var result = false;
+ final var currentLastActiveTime = this.lastActiveTime;
+ if (isGcIfInactive()
+ && currentLastActiveTime != 0L
+ && destinationStatistics.getMessages().getCount() == 0L
+ && !isActive()) {
Review Comment:
This was added originally to gate the network and wildcard only config flags
behind the isActive(). Since markForGc calls isActive, this is now redundant.
Removing. Good catch
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information, visit: https://activemq.apache.org/contact
