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

ported fix to trunk : 

http://issues.apache.org/activemq/browse/AMQ-1181

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@514720 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jonas B. Lim 2007-03-05 16:26:08 +00:00
parent e5b45f6b4b
commit 49ea0eddf6
4 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
activemq-core/src/main/java/org/apache/activemq/broker/ConnectionContext.java
View File

@ -54,7 +54,7 @@ public class ConnectionContext {
private boolean producerFlowControl=true; private boolean producerFlowControl=true;
private MessageAuthorizationPolicy messageAuthorizationPolicy; private MessageAuthorizationPolicy messageAuthorizationPolicy;
private AtomicInteger referenceCounter = new AtomicInteger(); private AtomicInteger referenceCounter = new AtomicInteger();
private boolean networkConnection;
private final MessageEvaluationContext messageEvaluationContext = new MessageEvaluationContext(); private final MessageEvaluationContext messageEvaluationContext = new MessageEvaluationContext();
public ConnectionContext() { public ConnectionContext() {
@ -246,4 +246,11 @@ public class ConnectionContext {
return referenceCounter.decrementAndGet(); return referenceCounter.decrementAndGet();
} }
public synchronized boolean isNetworkConnection() {
return networkConnection;
}
public synchronized void setNetworkConnection(boolean networkConnection) {
this.networkConnection = networkConnection;
}
} }

10
activemq-core/src/main/java/org/apache/activemq/broker/TransportConnection.java
View File

@ -119,7 +119,8 @@ public class TransportConnection implements Service,Connection,Task,CommandVisit
private final Map<ConsumerId,ConsumerBrokerExchange>consumerExchanges = new HashMap<ConsumerId,ConsumerBrokerExchange>(); private final Map<ConsumerId,ConsumerBrokerExchange>consumerExchanges = new HashMap<ConsumerId,ConsumerBrokerExchange>();
private CountDownLatch dispatchStoppedLatch = new CountDownLatch(1); private CountDownLatch dispatchStoppedLatch = new CountDownLatch(1);
protected AtomicBoolean dispatchStopped=new AtomicBoolean(false); protected AtomicBoolean dispatchStopped=new AtomicBoolean(false);
private boolean networkConnection;
static class ConnectionState extends org.apache.activemq.state.ConnectionState{ static class ConnectionState extends org.apache.activemq.state.ConnectionState{
private final ConnectionContext context; private final ConnectionContext context;
@ -627,6 +628,7 @@ public class TransportConnection implements Service,Connection,Task,CommandVisit
context.setUserName(info.getUserName()); context.setUserName(info.getUserName());
context.setConnectionId(info.getConnectionId()); context.setConnectionId(info.getConnectionId());
context.setWireFormatInfo(wireFormatInfo); context.setWireFormatInfo(wireFormatInfo);
context.setNetworkConnection(networkConnection);
context.incrementReference(); context.incrementReference();
this.manageable=info.isManageable(); this.manageable=info.isManageable();
state=new ConnectionState(info,context,this); state=new ConnectionState(info,context,this);
@ -1027,6 +1029,12 @@ public class TransportConnection implements Service,Connection,Task,CommandVisit
} }
this.brokerInfo=info; this.brokerInfo=info;
broker.addBroker(this,info); broker.addBroker(this,info);
networkConnection = true;
for (Iterator iter = localConnectionStates.values().iterator(); iter.hasNext();) {
ConnectionState cs = (ConnectionState) iter.next();
cs.getContext().setNetworkConnection(true);
}
return null; return null;
} }

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

@ -325,7 +325,7 @@ public class Queue implements Destination, Task {
} }
return; return;
} }
if(context.isProducerFlowControl()){ if (context.isProducerFlowControl() && !context.isNetworkConnection()) {
if(usageManager.isSendFailIfNoSpace()&&usageManager.isFull()){ if(usageManager.isSendFailIfNoSpace()&&usageManager.isFull()){
throw new javax.jms.ResourceAllocationException("Usage Manager memory limit reached"); throw new javax.jms.ResourceAllocationException("Usage Manager memory limit reached");
}else{ }else{

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

@ -243,7 +243,7 @@ public class Topic implements Destination {
if( message.isExpired() ) { if( message.isExpired() ) {
return; return;
} }
if (context.isProducerFlowControl()) { if (context.isProducerFlowControl() && !context.isNetworkConnection() ) {
if (usageManager.isSendFailIfNoSpace() && usageManager.isFull()) { if (usageManager.isSendFailIfNoSpace() && usageManager.isFull()) {
throw new javax.jms.ResourceAllocationException("Usage Manager memory limit reached"); throw new javax.jms.ResourceAllocationException("Usage Manager memory limit reached");
} else { } else {