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

Updated to support sendTimeouts - see https://issues.apache.org/activemq/browse/AMQ-1517 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@646437 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Robert Davies 2008-04-09 17:02:04 +00:00
parent aba1195cc5
commit 114a923779
7 changed files with 69 additions and 15 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

@ -142,6 +142,7 @@ public class ActiveMQConnection implements Connection, TopicConnection, QueueCon
private int closeTimeout = 15000;
private boolean watchTopicAdvisories = true;
private long warnAboutUnstartedConnectionTimeout = 500L;
private int sendTimeout =0;
private final Transport transport;
private final IdGenerator clientIdGenerator;
@ -1518,6 +1519,21 @@ public class ActiveMQConnection implements Connection, TopicConnection, QueueCon
public void setWarnAboutUnstartedConnectionTimeout(long warnAboutUnstartedConnectionTimeout) {
this.warnAboutUnstartedConnectionTimeout = warnAboutUnstartedConnectionTimeout;
}
/**
* @return the sendTimeout
*/
public int getSendTimeout() {
return sendTimeout;
}
/**
* @param sendTimeout the sendTimeout to set
*/
public void setSendTimeout(int sendTimeout) {
this.sendTimeout = sendTimeout;
}
/**
* Returns the time this connection was created
@ -2091,5 +2107,4 @@ public class ActiveMQConnection implements Connection, TopicConnection, QueueCon
protected void rollbackDuplicate(ActiveMQDispatcher dispatcher, Message message) {
connectionAudit.rollbackDuplicate(dispatcher, message);
}
}

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

@ -106,6 +106,7 @@ public class ActiveMQConnectionFactory extends JNDIBaseStorable implements Conne
private boolean watchTopicAdvisories = true;
private int producerWindowSize = DEFAULT_PRODUCER_WINDOW_SIZE;
private long warnAboutUnstartedConnectionTimeout = 500L;
private int sendTimeout =0;
private TransportListener transportListener;
// /////////////////////////////////////////////
@ -302,6 +303,7 @@ public class ActiveMQConnectionFactory extends JNDIBaseStorable implements Conne
connection.setWatchTopicAdvisories(isWatchTopicAdvisories());
connection.setProducerWindowSize(getProducerWindowSize());
connection.setWarnAboutUnstartedConnectionTimeout(getWarnAboutUnstartedConnectionTimeout());
connection.setSendTimeout(getSendTimeout());
if (transportListener != null) {
connection.addTransportListener(transportListener);
}
@ -533,6 +535,21 @@ public class ActiveMQConnectionFactory extends JNDIBaseStorable implements Conne
public MessageTransformer getTransformer() {
return transformer;
}
/**
* @return the sendTimeout
*/
public int getSendTimeout() {
return sendTimeout;
}
/**
* @param sendTimeout the sendTimeout to set
*/
public void setSendTimeout(int sendTimeout) {
this.sendTimeout = sendTimeout;
}
/**
* Sets the transformer used to transform messages before they are sent on
@ -627,6 +644,7 @@ public class ActiveMQConnectionFactory extends JNDIBaseStorable implements Conne
props.setProperty("statsEnabled", Boolean.toString(isStatsEnabled()));
props.setProperty("alwaysSyncSend", Boolean.toString(isAlwaysSyncSend()));
props.setProperty("producerWindowSize", Integer.toString(getProducerWindowSize()));
props.setProperty("sendTimeout", Integer.toString(getSendTimeout()));
}
public boolean isUseCompression() {

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

@ -79,7 +79,7 @@ public class ActiveMQMessageProducer extends ActiveMQMessageProducerSupport impl
private MessageTransformer transformer;
private MemoryUsage producerWindow;
protected ActiveMQMessageProducer(ActiveMQSession session, ProducerId producerId, ActiveMQDestination destination) throws JMSException {
protected ActiveMQMessageProducer(ActiveMQSession session, ProducerId producerId, ActiveMQDestination destination, int sendTimeout) throws JMSException {
super(session);
this.info = new ProducerInfo(producerId);
this.info.setWindowSize(session.connection.getProducerWindowSize());
@ -104,6 +104,7 @@ public class ActiveMQMessageProducer extends ActiveMQMessageProducerSupport impl
this.stats = new JMSProducerStatsImpl(session.getSessionStats(), destination);
this.session.addProducer(this);
this.session.asyncSendPacket(info);
this.setSendTimeout(sendTimeout);
setTransformer(session.getTransformer());
}
@ -223,7 +224,7 @@ public class ActiveMQMessageProducer extends ActiveMQMessageProducerSupport impl
}
}
this.session.send(this, dest, message, deliveryMode, priority, timeToLive, producerWindow);
this.session.send(this, dest, message, deliveryMode, priority, timeToLive, producerWindow,sendTimeout);
stats.onMessage();
}

15
activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageProducerSupport.java
View File

@ -35,6 +35,7 @@ public abstract class ActiveMQMessageProducerSupport implements MessageProducer,
protected int defaultDeliveryMode;
protected int defaultPriority;
protected long defaultTimeToLive;
protected int sendTimeout=0;
public ActiveMQMessageProducerSupport(ActiveMQSession session) {
this.session = session;
@ -305,4 +306,18 @@ public abstract class ActiveMQMessageProducerSupport implements MessageProducer,
protected abstract void checkClosed() throws IllegalStateException;
/**
* @return the sendTimeout
*/
public int getSendTimeout() {
return sendTimeout;
}
/**
* @param sendTimeout the sendTimeout to set
*/
public void setSendTimeout(int sendTimeout) {
this.sendTimeout = sendTimeout;
}
}

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

@ -72,9 +72,9 @@ import org.apache.activemq.command.ActiveMQDestination;
public class ActiveMQQueueSender extends ActiveMQMessageProducer implements QueueSender {
protected ActiveMQQueueSender(ActiveMQSession session, ActiveMQDestination destination)
protected ActiveMQQueueSender(ActiveMQSession session, ActiveMQDestination destination,int sendTimeout)
throws JMSException {
super(session, session.getNextProducerId(), destination);
super(session, session.getNextProducerId(), destination,sendTimeout);
}
/**

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

@ -812,8 +812,8 @@ public class ActiveMQSession implements Session, QueueSession, TopicSession, Sta
CustomDestination customDestination = (CustomDestination)destination;
return customDestination.createProducer(this);
}
return new ActiveMQMessageProducer(this, getNextProducerId(), ActiveMQMessageTransformation.transformDestination(destination));
int timeSendOut = connection.getSendTimeout();
return new ActiveMQMessageProducer(this, getNextProducerId(), ActiveMQMessageTransformation.transformDestination(destination),timeSendOut);
}
/**
@ -1293,8 +1293,8 @@ public class ActiveMQSession implements Session, QueueSession, TopicSession, Sta
CustomDestination customDestination = (CustomDestination)queue;
return customDestination.createSender(this);
}
return new ActiveMQQueueSender(this, ActiveMQMessageTransformation.transformDestination(queue));
int timeSendOut = connection.getSendTimeout();
return new ActiveMQQueueSender(this, ActiveMQMessageTransformation.transformDestination(queue),timeSendOut);
}
/**
@ -1390,7 +1390,8 @@ public class ActiveMQSession implements Session, QueueSession, TopicSession, Sta
CustomDestination customDestination = (CustomDestination)topic;
return customDestination.createPublisher(this);
}
return new ActiveMQTopicPublisher(this, ActiveMQMessageTransformation.transformDestination(topic));
int timeSendOut = connection.getSendTimeout();
return new ActiveMQTopicPublisher(this, ActiveMQMessageTransformation.transformDestination(topic),timeSendOut);
}
/**
@ -1576,7 +1577,7 @@ public class ActiveMQSession implements Session, QueueSession, TopicSession, Sta
* @throws JMSException
*/
protected void send(ActiveMQMessageProducer producer, ActiveMQDestination destination, Message message, int deliveryMode, int priority, long timeToLive,
MemoryUsage producerWindow) throws JMSException {
MemoryUsage producerWindow, int sendTimeout) throws JMSException {
checkClosed();
if (destination.isTemporary() && connection.isDeleted(destination)) {
@ -1623,7 +1624,7 @@ public class ActiveMQSession implements Session, QueueSession, TopicSession, Sta
if (this.debug) {
LOG.debug(getSessionId() + " sending message: " + msg);
}
if (!msg.isResponseRequired() && !connection.isAlwaysSyncSend() && (!msg.isPersistent() || connection.isUseAsyncSend() || txid != null)) {
if (sendTimeout <= 0 && !msg.isResponseRequired() && !connection.isAlwaysSyncSend() && (!msg.isPersistent() || connection.isUseAsyncSend() || txid != null)) {
this.connection.asyncSendPacket(msg);
if (producerWindow != null) {
// Since we defer lots of the marshaling till we hit the
@ -1637,7 +1638,11 @@ public class ActiveMQSession implements Session, QueueSession, TopicSession, Sta
producerWindow.increaseUsage(size);
}
} else {
this.connection.syncSendPacket(msg);
if (sendTimeout > 0) {
this.connection.syncSendPacket(msg,sendTimeout);
}else {
this.connection.syncSendPacket(msg);
}
}
}

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

@ -85,8 +85,8 @@ public class ActiveMQTopicPublisher extends ActiveMQMessageProducer implements
TopicPublisher {
protected ActiveMQTopicPublisher(ActiveMQSession session,
ActiveMQDestination destination) throws JMSException {
super(session, session.getNextProducerId(), destination);
ActiveMQDestination destination, int sendTimeout) throws JMSException {
super(session, session.getNextProducerId(), destination,sendTimeout);
}
/**