Repository: qpid-jms
Updated Branches:
  refs/heads/master 6045f0aee -> 40eb821c6


Removing the isExpired method from JmsMessage.  Will need to add
something to the message facade later to allow a consumer to check prior
to dispatch to ensure that prefetched messages get filtered if they
expired while sitting in the buffer.  Something along
message.getFacade().isExpired()

Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/40eb821c
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/40eb821c
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/40eb821c

Branch: refs/heads/master
Commit: 40eb821c622f36252dcfbc36d9629a36496eb542
Parents: 6045f0a
Author: Timothy Bish <tabish...@gmail.com>
Authored: Fri Oct 10 12:34:44 2014 -0400
Committer: Timothy Bish <tabish...@gmail.com>
Committed: Fri Oct 10 12:34:44 2014 -0400

----------------------------------------------------------------------
 .../main/java/org/apache/qpid/jms/message/JmsMessage.java   | 5 -----
 .../java/org/apache/qpid/jms/message/JmsMessageTest.java    | 9 ---------
 2 files changed, 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/40eb821c/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMessage.java
----------------------------------------------------------------------
diff --git 
a/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMessage.java 
b/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMessage.java
index 9c1cc0e..77ac748 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMessage.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMessage.java
@@ -500,11 +500,6 @@ public class JmsMessage implements javax.jms.Message {
         this.connection = connection;
     }
 
-    public boolean isExpired() throws JMSException {
-        long expireTime = facade.getExpiration();
-        return expireTime > 0 && System.currentTimeMillis() > expireTime;
-    }
-
     public JmsMessageFacade getFacade() {
         return this.facade;
     }

http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/40eb821c/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMessageTest.java
----------------------------------------------------------------------
diff --git 
a/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMessageTest.java 
b/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMessageTest.java
index 8c17dfc..b3ffc30 100644
--- 
a/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMessageTest.java
+++ 
b/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMessageTest.java
@@ -1019,15 +1019,6 @@ public class JmsMessageTest {
     }
 
     @Test
-    public void testIsExpired() throws JMSException {
-        JmsMessage msg = factory.createMessage();
-        msg.setJMSExpiration(System.currentTimeMillis() - 1);
-        assertTrue(msg.isExpired());
-        msg.setJMSExpiration(System.currentTimeMillis() + 10000);
-        assertFalse(msg.isExpired());
-    }
-
-    @Test
     public void testAcknowledgeWitNoCallback() throws JMSException {
         JmsMessage msg = factory.createMessage();
         msg.acknowledge();


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org

Reply via email to