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-2777 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@954599 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Robert Davies 2010-06-14 19:21:21 +00:00
parent 027d2e71b6
commit 794e62fbaa
2 changed files with 35 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
activemq-core/src/main/java/org/apache/activemq/ActiveMQConnection.java
View File

@ -147,6 +147,7 @@ public class ActiveMQConnection implements Connection, TopicConnection, QueueCon
private long warnAboutUnstartedConnectionTimeout = 500L;
private int sendTimeout =0;
private boolean sendAcksAsync=true;
private boolean checkForDuplicates = true;
private final Transport transport;
private final IdGenerator clientIdGenerator;
@ -2245,7 +2246,7 @@ public class ActiveMQConnection implements Connection, TopicConnection, QueueCon
}
protected boolean isDuplicate(ActiveMQDispatcher dispatcher, Message message) {
return connectionAudit.isDuplicate(dispatcher, message);
return checkForDuplicates && connectionAudit.isDuplicate(dispatcher, message);
}
protected void rollbackDuplicate(ActiveMQDispatcher dispatcher, Message message) {
@ -2317,4 +2318,18 @@ public class ActiveMQConnection implements Connection, TopicConnection, QueueCon
protected ThreadPoolExecutor getExecutor() {
return this.executor;
}
/**
* @return the checkForDuplicates
*/
public boolean isCheckForDuplicates() {
return this.checkForDuplicates;
}
/**
* @param checkForDuplicates the checkForDuplicates to set
*/
public void setCheckForDuplicates(boolean checkForDuplicates) {
this.checkForDuplicates = checkForDuplicates;
}
}

21
activemq-core/src/main/java/org/apache/activemq/ActiveMQConnectionFactory.java
View File

@ -24,7 +24,6 @@ import java.util.Properties;
import java.util.concurrent.Executor;
import java.util.concurrent.ScheduledThreadPoolExecutor;
import java.util.concurrent.ThreadFactory;
import javax.jms.Connection;
import javax.jms.ConnectionFactory;
import javax.jms.ExceptionListener;
@ -34,7 +33,6 @@ import javax.jms.QueueConnectionFactory;
import javax.jms.TopicConnection;
import javax.jms.TopicConnectionFactory;
import javax.naming.Context;
import org.apache.activemq.blob.BlobTransferPolicy;
import org.apache.activemq.jndi.JNDIBaseStorable;
import org.apache.activemq.management.JMSStatsImpl;
@ -115,6 +113,7 @@ public class ActiveMQConnectionFactory extends JNDIBaseStorable implements Conne
private int auditMaximumProducerNumber = ActiveMQMessageAudit.MAXIMUM_PRODUCER_COUNT;
private boolean useDedicatedTaskRunner;
private long consumerFailoverRedeliveryWaitPeriod = 0;
private boolean checkForDuplicates = true;
private ClientInternalExceptionListener clientInternalExceptionListener;
// /////////////////////////////////////////////
@ -318,6 +317,7 @@ public class ActiveMQConnectionFactory extends JNDIBaseStorable implements Conne
connection.setAuditMaximumProducerNumber(getAuditMaximumProducerNumber());
connection.setUseDedicatedTaskRunner(isUseDedicatedTaskRunner());
connection.setConsumerFailoverRedeliveryWaitPeriod(getConsumerFailoverRedeliveryWaitPeriod());
connection.setCheckForDuplicates(isCheckForDuplicates());
if (transportListener != null) {
connection.addTransportListener(transportListener);
}
@ -594,6 +594,7 @@ public class ActiveMQConnectionFactory extends JNDIBaseStorable implements Conne
this.transformer = transformer;
}
@Override
public void buildFromProperties(Properties properties) {
if (properties == null) {
@ -638,6 +639,7 @@ public class ActiveMQConnectionFactory extends JNDIBaseStorable implements Conne
return rc;
}
@Override
public void populateProperties(Properties props) {
props.setProperty("dispatchAsync", Boolean.toString(isDispatchAsync()));
@ -682,6 +684,7 @@ public class ActiveMQConnectionFactory extends JNDIBaseStorable implements Conne
props.setProperty("sendAcksAsync",Boolean.toString(isSendAcksAsync()));
props.setProperty("auditDepth", Integer.toString(getAuditDepth()));
props.setProperty("auditMaximumProducerNumber", Integer.toString(getAuditMaximumProducerNumber()));
props.setProperty("checkForDuplicates", Boolean.toString(isCheckForDuplicates()));
}
public boolean isUseCompression() {
@ -945,4 +948,18 @@ public class ActiveMQConnectionFactory extends JNDIBaseStorable implements Conne
ClientInternalExceptionListener clientInternalExceptionListener) {
this.clientInternalExceptionListener = clientInternalExceptionListener;
}
/**
* @return the checkForDuplicates
*/
public boolean isCheckForDuplicates() {
return this.checkForDuplicates;
}
/**
* @param checkForDuplicates the checkForDuplicates to set
*/
public void setCheckForDuplicates(boolean checkForDuplicates) {
this.checkForDuplicates = checkForDuplicates;
}
}