Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix for https://issues.apache.org/activemq/browse/AMQ-1656 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@646880 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Robert Davies 2008-04-10 17:18:05 +00:00
parent 0e5dda068c
commit dfcf776e5d
10 changed files with 43 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
activemq-core/src/main/java/org/apache/activemq/broker/Broker.java
View File

@ -313,4 +313,9 @@ public interface Broker extends Region, Service {
*/
void sendToDeadLetterQueue(ConnectionContext context, MessageReference messageReference);
/**
* @return the broker sequence id
*/
long getBrokerSequenceId();
}

4
activemq-core/src/main/java/org/apache/activemq/broker/BrokerFilter.java
View File

@ -260,4 +260,8 @@ public class BrokerFilter implements Broker {
public Broker getRoot() {
return next.getRoot();
}
public long getBrokerSequenceId() {
return next.getBrokerSequenceId();
}
}

4
activemq-core/src/main/java/org/apache/activemq/broker/EmptyBroker.java
View File

@ -252,4 +252,8 @@ public class EmptyBroker implements Broker {
public Broker getRoot() {
return null;
}
public long getBrokerSequenceId() {
return -1l;
}
}

4
activemq-core/src/main/java/org/apache/activemq/broker/ErrorBroker.java
View File

@ -263,4 +263,8 @@ public class ErrorBroker implements Broker {
public Broker getRoot() {
throw new BrokerStoppedException(this.message);
}
public long getBrokerSequenceId() {
throw new BrokerStoppedException(this.message);
}
}

4
activemq-core/src/main/java/org/apache/activemq/broker/MutableBrokerFilter.java
View File

@ -274,4 +274,8 @@ public class MutableBrokerFilter implements Broker {
return getNext().getRoot();
}
public long getBrokerSequenceId() {
return getNext().getBrokerSequenceId();
}
}

6
activemq-core/src/main/java/org/apache/activemq/broker/region/BaseDestination.java
View File

@ -46,6 +46,7 @@ public abstract class BaseDestination implements Destination {
private boolean lazyDispatch=false;
protected final DestinationStatistics destinationStatistics = new DestinationStatistics();
protected final BrokerService brokerService;
protected final Broker regionBroker;
/**
* @param broker
@ -66,6 +67,7 @@ public abstract class BaseDestination implements Destination {
this.systemUsage = brokerService.getProducerSystemUsage();
this.memoryUsage = new MemoryUsage(systemUsage.getMemoryUsage(), destination.toString());
this.memoryUsage.setUsagePortion(1.0f);
this.regionBroker = brokerService.getRegionBroker();
}
/**
@ -194,4 +196,8 @@ public abstract class BaseDestination implements Destination {
public void setLazyDispatch(boolean lazyDispatch) {
this.lazyDispatch = lazyDispatch;
}
protected long getDestinationSequenceId() {
return regionBroker.getBrokerSequenceId();
}
}

2
activemq-core/src/main/java/org/apache/activemq/broker/region/Queue.java
View File

@ -430,7 +430,7 @@ public class Queue extends BaseDestination implements Task {
"Connection closed, send aborted.");
}
}
message.getMessageId().setBrokerSequenceId(getDestinationSequenceId());
store.addMessage(context, message);
}

11
activemq-core/src/main/java/org/apache/activemq/broker/region/RegionBroker.java
View File

@ -418,8 +418,6 @@ public class RegionBroker implements Broker {
}
public void send(ProducerBrokerExchange producerExchange, Message message) throws Exception {
long si = sequenceGenerator.getNextSequenceId();
message.getMessageId().setBrokerSequenceId(si);
message.setBrokerInTime(System.currentTimeMillis());
if (producerExchange.isMutable() || producerExchange.getRegion() == null) {
ActiveMQDestination destination = message.getDestination();
@ -730,4 +728,13 @@ public class RegionBroker implements Broker {
throw new RuntimeException("The broker from the BrokerService should not throw an exception");
}
}
/**
* @return the broker sequence id
*/
public long getBrokerSequenceId() {
synchronized(sequenceGenerator) {
return sequenceGenerator.getNextSequenceId();
}
}
}

1
activemq-core/src/main/java/org/apache/activemq/broker/region/Topic.java
View File

@ -382,6 +382,7 @@ public class Topic extends BaseDestination implements Task{
final ConnectionContext context = producerExchange
.getConnectionContext();
message.setRegionDestination(this);
message.getMessageId().setBrokerSequenceId(getDestinationSequenceId());
if (topicStore != null && message.isPersistent()
&& !canOptimizeOutPersistence()) {

4
activemq-core/src/test/java/org/apache/activemq/broker/StubBroker.java
View File

@ -258,4 +258,8 @@ public class StubBroker implements Broker {
public Broker getRoot() {
return this;
}
public long getBrokerSequenceId() {
return -1l;
}
}