QPID-1783 : Relax MessageFactory to allow out of order recovery

Relax MessageFactory to allow out of order. Updated test

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@760952 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 4 insertions, 8 deletions

diff --git a/java/broker/src/main/java/org/apache/qpid/server/queue/MessageFactory.java b/java/broker/src/main/java/org/apache/qpid/server/queue/MessageFactory.java
index 9924733178..10e7dca18f 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/queue/MessageFactory.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/queue/MessageFactory.java
@@ -85,17 +85,13 @@ public class MessageFactory
             throw new RuntimeException("Unable to create message by ID when not recovering");
         }
 
-        long currentID = _messageId.get();
-        if (messageId <= currentID)
+        if (messageId < 0L)
         {
-            throw new RuntimeException("Message IDs can only increase current id is:"
-                                       + currentID + ". Requested:" + messageId);
-        }
-        else
-        {
-            _messageId.set(messageId);
+            throw new RuntimeException("Message IDs can only be positive. Requested:" + messageId);
         }
 
+        _messageId.set((int)Math.max(messageId, _messageId.get()));
+
         return createNextMessage(messageId, transactionLog, true);
     }