[hornetq-commits] JBoss hornetq SVN: r8017 - in trunk: src/main/org/hornetq/core/server/impl and 1 other directories.

[do-not-reply at jboss.org]

Author: timfox
Date: 2009-09-30 18:49:33 -0400 (Wed, 30 Sep 2009)
New Revision: 8017

Modified:
   trunk/src/main/org/hornetq/core/postoffice/impl/PostOfficeImpl.java
   trunk/src/main/org/hornetq/core/server/impl/QueueImpl.java
   trunk/src/main/org/hornetq/core/server/impl/ServerMessageImpl.java
   trunk/tests/src/org/hornetq/tests/integration/client/LargeMessageTest.java
Log:
fixed build

Modified: trunk/src/main/org/hornetq/core/postoffice/impl/PostOfficeImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/postoffice/impl/PostOfficeImpl.java	2009-09-30 18:00:33 UTC (rev 8016)
+++ trunk/src/main/org/hornetq/core/postoffice/impl/PostOfficeImpl.java	2009-09-30 22:49:33 UTC (rev 8017)
@@ -535,7 +535,7 @@
    public void route(final ServerMessage message, Transaction tx) throws Exception
    {
       SimpleString address = message.getDestination();
-
+      
       byte[] duplicateIDBytes = null;
 
       Object duplicateID = message.getProperty(MessageImpl.HDR_DUPLICATE_DETECTION_ID);
@@ -622,7 +622,7 @@
       {
          routed = false;
       }
-      
+
       if (!routed)
       {
          AddressSettings addressSettings = addressSettingsRepository.getMatch(address.toString());

Modified: trunk/src/main/org/hornetq/core/server/impl/QueueImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/server/impl/QueueImpl.java	2009-09-30 18:00:33 UTC (rev 8016)
+++ trunk/src/main/org/hornetq/core/server/impl/QueueImpl.java	2009-09-30 22:49:33 UTC (rev 8017)
@@ -13,10 +13,6 @@
 
 package org.hornetq.core.server.impl;
 
-import static org.hornetq.core.message.impl.MessageImpl.HDR_ACTUAL_EXPIRY_TIME;
-import static org.hornetq.core.message.impl.MessageImpl.HDR_ORIGINAL_DESTINATION;
-import static org.hornetq.core.message.impl.MessageImpl.HDR_ORIG_MESSAGE_ID;
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
@@ -1780,8 +1776,6 @@
    public synchronized void pause()
    {
       paused = true;
-      
-      log.info("Paused is now " + paused);
    }
 
    public synchronized void resume()
@@ -1793,7 +1787,6 @@
 
    public synchronized boolean isPaused()
    {
-      log.info("return ispaused " + paused);
       return paused;
    }
 }

Modified: trunk/src/main/org/hornetq/core/server/impl/ServerMessageImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/server/impl/ServerMessageImpl.java	2009-09-30 18:00:33 UTC (rev 8016)
+++ trunk/src/main/org/hornetq/core/server/impl/ServerMessageImpl.java	2009-09-30 22:49:33 UTC (rev 8017)
@@ -210,11 +210,11 @@
          putLongProperty(HDR_ORIG_MESSAGE_ID, other.getMessageID());
       }
       
+      // reset expiry
+      setExpiration(0);
+            
       if (expiry)
-      {
-         // reset expiry
-         setExpiration(0);
-         
+      {         
          long actualExpiryTime = System.currentTimeMillis();
 
          putLongProperty(HDR_ACTUAL_EXPIRY_TIME, actualExpiryTime);

Modified: trunk/tests/src/org/hornetq/tests/integration/client/LargeMessageTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/LargeMessageTest.java	2009-09-30 18:00:33 UTC (rev 8016)
+++ trunk/tests/src/org/hornetq/tests/integration/client/LargeMessageTest.java	2009-09-30 22:49:33 UTC (rev 8017)
@@ -549,8 +549,7 @@
          consumerExpiry.close();
 
          for (int i = 0; i < 10; i++)
-         {
-
+         { 
             consumerExpiry = session.createConsumer(ADDRESS_DLA);
 
             msg1 = consumerExpiry.receive(5000);