activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r511464 - in /activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker: region/RegionBroker.java util/TimeStampingBrokerPlugin.java
Date Sun, 25 Feb 2007 08:34:49 GMT
Author: chirino
Date: Sun Feb 25 00:34:49 2007
New Revision: 511464

URL: http://svn.apache.org/viewvc?view=rev&rev=511464
Log:
Backported fix to AMQ-1165 

Added:
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/util/TimeStampingBrokerPlugin.java
      - copied unchanged from r511463, activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/broker/util/TimeStampingBrokerPlugin.java
Modified:
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/RegionBroker.java

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/RegionBroker.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/RegionBroker.java?view=diff&rev=511464&r1=511463&r2=511464
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/RegionBroker.java
(original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/RegionBroker.java
Sun Feb 25 00:34:49 2007
@@ -369,10 +369,6 @@
     public void send(ConnectionContext context,  Message message) throws Exception {
         long si = sequenceGenerator.getNextSequenceId();
         message.getMessageId().setBrokerSequenceId(si);
-        if (message.getTimestamp() > 0 && (message.getBrokerPath() == null ||
message.getBrokerPath().length == 0)) { 
-            //timestamp not been disabled and has not passed through a network
-            message.setTimestamp(System.currentTimeMillis());
-        }
         ActiveMQDestination destination = message.getDestination();
         switch(destination.getDestinationType()) {
         case ActiveMQDestination.QUEUE_TYPE:



Mime
View raw message