Author: aidan
Date: Fri Apr 18 15:18:05 2008
New Revision: 649711
URL: http://svn.apache.org/viewvc?rev=649711&view=rev
Log:
QPID-832 fix some compile errors
Modified:
incubator/qpid/branches/thegreatmerge/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
incubator/qpid/branches/thegreatmerge/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java
Modified:
incubator/qpid/branches/thegreatmerge/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java?rev=649711&r1=649710&r2=649711&view=diff
==============================================================================
---
incubator/qpid/branches/thegreatmerge/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
(original)
+++
incubator/qpid/branches/thegreatmerge/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
Fri Apr 18 15:18:05 2008
@@ -189,51 +189,8 @@
_fastAccessConsumers[i] = null;
}
}
-
-
- public void acknowledgeDelivered()
- {
-
- for(int i = 0; i<16; i++)
- {
- final BasicMessageConsumer c = _fastAccessConsumers[i];
- if(c != null)
- {
- c.acknowledgeDelivered();
- }
- }
- if(!_slowAccessConsumers.isEmpty())
- {
- for (Iterator<BasicMessageConsumer> i =
_slowAccessConsumers.values().iterator(); i.hasNext();)
- {
- i.next().acknowledgeDelivered();
- }
- }
- }
-
- public void acknowledge() throws JMSException
- {
- for(int i = 0; i<16; i++)
- {
- final BasicMessageConsumer c = _fastAccessConsumers[i];
- if(c != null)
- {
- c.acknowledge();
- }
- }
- if(!_slowAccessConsumers.isEmpty())
- {
- for (Iterator<BasicMessageConsumer> i =
_slowAccessConsumers.values().iterator(); i.hasNext();)
- {
- i.next().acknowledge();
- }
- }
- }
}
-
-
-
/** Used for debugging. */
private static final Logger _logger =
LoggerFactory.getLogger(AMQSession.class);
@@ -555,14 +512,22 @@
*
* @throws IllegalStateException If the session is closed.
*/
- public void acknowledge() throws JMSException
+ public void acknowledge() throws IllegalStateException
{
if (isClosed())
{
throw new IllegalStateException("Session is already closed");
}
- _consumers.acknowledge();
+ while (true)
+ {
+ Long tag = _unacknowledgedMessageTags.poll();
+ if (tag == null)
+ {
+ break;
+ }
+ acknowledgeMessage(tag, false);
+ }
}
/**
Modified:
incubator/qpid/branches/thegreatmerge/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java?rev=649711&r1=649710&r2=649711&view=diff
==============================================================================
---
incubator/qpid/branches/thegreatmerge/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java
(original)
+++
incubator/qpid/branches/thegreatmerge/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java
Fri Apr 18 15:18:05 2008
@@ -285,29 +285,11 @@
protected void preApplicationProcessing(AbstractJMSMessage jmsMsg) throws
JMSException
{
- // TGM FIXME not sure messages are being dealt with right
- switch (_session.getAcknowledgeMode())
+ if (_session.getAcknowledgeMode() == Session.CLIENT_ACKNOWLEDGE)
{
- case Session.DUPS_OK_ACKNOWLEDGE:
- case Session.CLIENT_ACKNOWLEDGE:
- _unacknowledgedDeliveryTags.add(jmsMsg.getDeliveryTag());
- break;
-
- case Session.SESSION_TRANSACTED:
- if (isNoConsume())
- {
- _session.acknowledgeMessage(jmsMsg.getDeliveryTag(),
false);
- }
- else
- {
- _logger.info("Recording tag for commit:" +
jmsMsg.getDeliveryTag());
- _receivedDeliveryTags.add(jmsMsg.getDeliveryTag());
- }
-
- break;
_session.addUnacknowledgedMessage(jmsMsg.getDeliveryTag());
}
-
+
_session.setInRecovery(false);
}
@@ -945,35 +927,6 @@
}
}
- public void acknowledge() throws JMSException
- {
- if (isClosed())
- {
- throw new IllegalStateException("Consumer is closed");
- }
- else if (_session.hasFailedOver())
- {
- throw new JMSException("has failed over");
- }
- else
- {
- Iterator<Long> tags = _unacknowledgedDeliveryTags.iterator();
- while (tags.hasNext())
- {
- _session.acknowledgeMessage(tags.next(), false);
- tags.remove();
- }
- }
- }
-
- /**
- * Called on recovery to reset the list of delivery tags
- */
- public void clearUnackedMessages()
- {
- _unacknowledgedDeliveryTags.clear();
- }
-
public boolean isAutoClose()
{
return _autoClose;
@@ -1092,6 +1045,7 @@
public void failedOver()
{
clearReceiveQueue();
- clearUnackedMessages();
+ // TGM FIXME: think this should just be removed
+ // clearUnackedMessages();
}
}
