JBoss hornetq SVN: r12223 - branches/Branch_2_2_AS7/tests/src/org/hornetq/tests/unit/util.
by do-not-reply＠jboss.org
Author: clebert.suconic
Date: 2012-03-01 11:04:10 -0500 (Thu, 01 Mar 2012)
New Revision: 12223
Modified:
branches/Branch_2_2_AS7/tests/src/org/hornetq/tests/unit/util/LinkedListTest.java
Log:
Adding unit-test on JBPAPP-8282
Modified: branches/Branch_2_2_AS7/tests/src/org/hornetq/tests/unit/util/LinkedListTest.java
===================================================================
--- branches/Branch_2_2_AS7/tests/src/org/hornetq/tests/unit/util/LinkedListTest.java 2012-03-01 15:22:53 UTC (rev 12222)
+++ branches/Branch_2_2_AS7/tests/src/org/hornetq/tests/unit/util/LinkedListTest.java 2012-03-01 16:04:10 UTC (rev 12223)
@@ -110,6 +110,76 @@
}
+ public void testAddHeadAndRemove()
+ {
+ final AtomicInteger count = new AtomicInteger(0);
+ class MyObject
+ {
+
+ public int payload;
+
+ MyObject(int payloadcount)
+ {
+ count.incrementAndGet();
+ this.payload = payloadcount;
+ }
+
+ protected void finalize() throws Exception
+ {
+ count.decrementAndGet();
+ }
+
+ public String toString()
+ {
+ return "" + payload;
+ }
+ };
+
+ LinkedListImpl<MyObject> objs = new LinkedListImpl<MyObject>();
+
+ // Initial add
+ for (int i = 1000; i >= 0; i--)
+ {
+ objs.addHead(new MyObject(i));
+ }
+ assertCount(1001, count);
+
+ LinkedListIterator<MyObject> iter = objs.iterator();
+
+ int countLoop = 0;
+ for (countLoop = 0 ; countLoop <= 1000; countLoop++)
+ {
+ MyObject obj = iter.next();
+ assertEquals(countLoop, obj.payload);
+ if (countLoop == 500 || countLoop == 1000)
+ {
+ iter.remove();
+ }
+ }
+
+ iter.close();
+
+ iter = objs.iterator();
+
+ countLoop = 0;
+ while (iter.hasNext())
+ {
+ if (countLoop == 500 || countLoop == 1000)
+ {
+ System.out.println("Jumping " + countLoop);
+ countLoop++;
+ }
+ MyObject obj = iter.next();
+ assertEquals(countLoop, obj.payload);
+ countLoop++;
+ }
+
+
+
+ assertCount(999, count);
+
+ }
+
/**
* @param count
*/
12 years, 2 months
JBoss hornetq SVN: r12222 - branches/Branch_2_2_EAP/src/main/org/hornetq/utils.
by do-not-reply＠jboss.org
Author: clebert.suconic
Date: 2012-03-01 10:22:53 -0500 (Thu, 01 Mar 2012)
New Revision: 12222
Modified:
branches/Branch_2_2_EAP/src/main/org/hornetq/utils/LinkedListImpl.java
Log:
JBPAPP-8282 - better fix
Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/utils/LinkedListImpl.java
===================================================================
--- branches/Branch_2_2_EAP/src/main/org/hornetq/utils/LinkedListImpl.java 2012-03-01 15:22:36 UTC (rev 12221)
+++ branches/Branch_2_2_EAP/src/main/org/hornetq/utils/LinkedListImpl.java 2012-03-01 15:22:53 UTC (rev 12222)
@@ -34,7 +34,7 @@
private static final int INITIAL_ITERATOR_ARRAY_SIZE = 10;
- private Node<E> head = new Node<E>(null);
+ private final Node<E> head = new Node<E>(null);
private Node<E> tail = null;
@@ -55,7 +55,7 @@
public void addHead(E e)
{
Node<E> node = new Node<E>(e);
-
+
node.next = head.next;
node.prev = head;
@@ -65,10 +65,11 @@
if (size == 0)
{
tail = node;
- }
- else
+ }
+ else
{
- tail.prev = node;
+ // Need to set the previous element on the former head
+ node.next.prev = node;
}
size++;
12 years, 2 months
JBoss hornetq SVN: r12221 - branches/Branch_2_2_AS7/src/main/org/hornetq/utils.
by do-not-reply＠jboss.org
Author: clebert.suconic
Date: 2012-03-01 10:22:36 -0500 (Thu, 01 Mar 2012)
New Revision: 12221
Modified:
branches/Branch_2_2_AS7/src/main/org/hornetq/utils/LinkedListImpl.java
Log:
JBPAPP-8282 - better fix
Modified: branches/Branch_2_2_AS7/src/main/org/hornetq/utils/LinkedListImpl.java
===================================================================
--- branches/Branch_2_2_AS7/src/main/org/hornetq/utils/LinkedListImpl.java 2012-03-01 13:58:24 UTC (rev 12220)
+++ branches/Branch_2_2_AS7/src/main/org/hornetq/utils/LinkedListImpl.java 2012-03-01 15:22:36 UTC (rev 12221)
@@ -34,7 +34,7 @@
private static final int INITIAL_ITERATOR_ARRAY_SIZE = 10;
- private Node<E> head = new Node<E>(null);
+ private final Node<E> head = new Node<E>(null);
private Node<E> tail = null;
@@ -55,7 +55,7 @@
public void addHead(E e)
{
Node<E> node = new Node<E>(e);
-
+
node.next = head.next;
node.prev = head;
@@ -65,10 +65,11 @@
if (size == 0)
{
tail = node;
- }
- else
+ }
+ else
{
- tail.prev = node;
+ // Need to set the previous element on the former head
+ node.next.prev = node;
}
size++;
12 years, 2 months
JBoss hornetq SVN: r12220 - branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/impl.
by do-not-reply＠jboss.org
Author: clebert.suconic
Date: 2012-03-01 08:58:24 -0500 (Thu, 01 Mar 2012)
New Revision: 12220
Modified:
branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/impl/ServerConsumerImpl.java
Log:
JBPAPP-8282 - fixing logs
Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/impl/ServerConsumerImpl.java
===================================================================
--- branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/impl/ServerConsumerImpl.java 2012-03-01 13:55:34 UTC (rev 12219)
+++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/impl/ServerConsumerImpl.java 2012-03-01 13:58:24 UTC (rev 12220)
@@ -255,7 +255,10 @@
if (filter != null && !filter.match(message))
{
- log.trace("Reference " + ref + " is a noMatch on consumer " + this);
+ if (log.isTraceEnabled())
+ {
+ log.trace("Reference " + ref + " is a noMatch on consumer " + this);
+ }
return HandleStatus.NO_MATCH;
}
@@ -264,7 +267,6 @@
log.trace("Handling reference " + ref);
}
-
if (!browseOnly)
{
if (!preAcknowledge)
12 years, 2 months
JBoss hornetq SVN: r12219 - branches/Branch_2_2_AS7/src/main/org/hornetq/core/server/impl.
by do-not-reply＠jboss.org
Author: clebert.suconic
Date: 2012-03-01 08:55:34 -0500 (Thu, 01 Mar 2012)
New Revision: 12219
Modified:
branches/Branch_2_2_AS7/src/main/org/hornetq/core/server/impl/ServerConsumerImpl.java
Log:
JBPAPP-8282 - fixing logs
Modified: branches/Branch_2_2_AS7/src/main/org/hornetq/core/server/impl/ServerConsumerImpl.java
===================================================================
--- branches/Branch_2_2_AS7/src/main/org/hornetq/core/server/impl/ServerConsumerImpl.java 2012-03-01 04:56:29 UTC (rev 12218)
+++ branches/Branch_2_2_AS7/src/main/org/hornetq/core/server/impl/ServerConsumerImpl.java 2012-03-01 13:55:34 UTC (rev 12219)
@@ -255,7 +255,10 @@
if (filter != null && !filter.match(message))
{
- log.trace("Reference " + ref + " is a noMatch on consumer " + this);
+ if (log.isTraceEnabled())
+ {
+ log.trace("Reference " + ref + " is a noMatch on consumer " + this);
+ }
return HandleStatus.NO_MATCH;
}
@@ -264,7 +267,6 @@
log.trace("Handling reference " + ref);
}
-
if (!browseOnly)
{
if (!preAcknowledge)
12 years, 2 months
JBoss hornetq SVN: r12218 - in branches/Branch_2_2_EAP: src/main/org/hornetq/utils and 1 other directories.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2012-02-29 23:56:29 -0500 (Wed, 29 Feb 2012)
New Revision: 12218
Modified:
branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/impl/ServerConsumerImpl.java
branches/Branch_2_2_EAP/src/main/org/hornetq/utils/LinkedListImpl.java
branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/client/ConsumerFilterTest.java
Log:
JBPAPP-8282 - Fixing remove element case
Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/impl/ServerConsumerImpl.java
===================================================================
--- branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/impl/ServerConsumerImpl.java 2012-03-01 04:55:36 UTC (rev 12217)
+++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/impl/ServerConsumerImpl.java 2012-03-01 04:56:29 UTC (rev 12218)
@@ -251,19 +251,20 @@
}
return HandleStatus.BUSY;
}
+ final ServerMessage message = ref.getMessage();
+ if (filter != null && !filter.match(message))
+ {
+ log.trace("Reference " + ref + " is a noMatch on consumer " + this);
+ return HandleStatus.NO_MATCH;
+ }
+
if (log.isTraceEnabled())
{
log.trace("Handling reference " + ref);
}
- final ServerMessage message = ref.getMessage();
- if (filter != null && !filter.match(message))
- {
- return HandleStatus.NO_MATCH;
- }
-
if (!browseOnly)
{
if (!preAcknowledge)
Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/utils/LinkedListImpl.java
===================================================================
--- branches/Branch_2_2_EAP/src/main/org/hornetq/utils/LinkedListImpl.java 2012-03-01 04:55:36 UTC (rev 12217)
+++ branches/Branch_2_2_EAP/src/main/org/hornetq/utils/LinkedListImpl.java 2012-03-01 04:56:29 UTC (rev 12218)
@@ -65,6 +65,10 @@
if (size == 0)
{
tail = node;
+ }
+ else
+ {
+ tail.prev = node;
}
size++;
Modified: branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/client/ConsumerFilterTest.java
===================================================================
--- branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/client/ConsumerFilterTest.java 2012-03-01 04:55:36 UTC (rev 12217)
+++ branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/client/ConsumerFilterTest.java 2012-03-01 04:56:29 UTC (rev 12218)
@@ -249,4 +249,86 @@
locator.close();
}
+
+ public void testLinkedListOrder() throws Exception
+ {
+ ServerLocator locator = createInVMNonHALocator();
+
+ ClientSessionFactory sf = locator.createSessionFactory();
+
+ ClientSession session = sf.createSession();
+
+ session.start();
+
+ session.createQueue("foo", "foo", true);
+
+ ClientProducer producer = session.createProducer("foo");
+
+ ClientConsumer redConsumer = session.createConsumer("foo", "color='red'");
+
+ ClientConsumer anyConsumer = session.createConsumer("foo");
+
+ sendMessage(session, producer, "any", "msg1");
+
+ sendMessage(session, producer, "any", "msg2");
+
+ sendMessage(session, producer, "any", "msg3");
+
+ sendMessage(session, producer, "red", "msgRed4");
+
+ sendMessage(session, producer, "red", "msgRed5");
+
+ readConsumer("anyConsumer", anyConsumer);
+
+ readConsumer("anyConsumer", anyConsumer);
+
+ log.info("### closing consumer ###");
+
+ anyConsumer.close();
+
+ readConsumer("redConsumer", redConsumer);
+
+ readConsumer("redConsumer", redConsumer);
+
+ log.info("### recreating consumer ###");
+
+ anyConsumer = session.createConsumer("foo");
+
+ session.start();
+
+ readConsumer("anyConsumer", anyConsumer);
+
+ session.close();
+
+ sf.close();
+
+ locator.close();
+ }
+
+ /**
+ * @param consumer
+ * @throws HornetQException
+ */
+ private void readConsumer(String consumerName, ClientConsumer consumer) throws Exception
+ {
+ ClientMessage message = consumer.receive(5000);
+ assertNotNull(message);
+ System.out.println("consumer = " + consumerName + " message, color=" + message.getStringProperty("color") + ", msg = " + message.getStringProperty("value"));
+ message.acknowledge();
+ }
+
+ /**
+ * @param session
+ * @param producer
+ * @return
+ * @throws HornetQException
+ */
+ private void sendMessage(ClientSession session, ClientProducer producer, String color, String msg) throws Exception
+ {
+ ClientMessage anyMessage = session.createMessage(true);
+ anyMessage.putStringProperty("color", color);
+ anyMessage.putStringProperty("value", msg);
+ producer.send(anyMessage);
+ session.commit();
+ }
}
12 years, 2 months
JBoss hornetq SVN: r12217 - in branches/Branch_2_2_AS7: src/main/org/hornetq/utils and 1 other directories.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2012-02-29 23:55:36 -0500 (Wed, 29 Feb 2012)
New Revision: 12217
Modified:
branches/Branch_2_2_AS7/src/main/org/hornetq/core/server/impl/ServerConsumerImpl.java
branches/Branch_2_2_AS7/src/main/org/hornetq/utils/LinkedListImpl.java
branches/Branch_2_2_AS7/tests/src/org/hornetq/tests/integration/client/ConsumerFilterTest.java
Log:
JBPAPP-8282 - Fixing remove element case
Modified: branches/Branch_2_2_AS7/src/main/org/hornetq/core/server/impl/ServerConsumerImpl.java
===================================================================
--- branches/Branch_2_2_AS7/src/main/org/hornetq/core/server/impl/ServerConsumerImpl.java 2012-02-28 16:44:34 UTC (rev 12216)
+++ branches/Branch_2_2_AS7/src/main/org/hornetq/core/server/impl/ServerConsumerImpl.java 2012-03-01 04:55:36 UTC (rev 12217)
@@ -251,19 +251,20 @@
}
return HandleStatus.BUSY;
}
+ final ServerMessage message = ref.getMessage();
+ if (filter != null && !filter.match(message))
+ {
+ log.trace("Reference " + ref + " is a noMatch on consumer " + this);
+ return HandleStatus.NO_MATCH;
+ }
+
if (log.isTraceEnabled())
{
log.trace("Handling reference " + ref);
}
- final ServerMessage message = ref.getMessage();
- if (filter != null && !filter.match(message))
- {
- return HandleStatus.NO_MATCH;
- }
-
if (!browseOnly)
{
if (!preAcknowledge)
Modified: branches/Branch_2_2_AS7/src/main/org/hornetq/utils/LinkedListImpl.java
===================================================================
--- branches/Branch_2_2_AS7/src/main/org/hornetq/utils/LinkedListImpl.java 2012-02-28 16:44:34 UTC (rev 12216)
+++ branches/Branch_2_2_AS7/src/main/org/hornetq/utils/LinkedListImpl.java 2012-03-01 04:55:36 UTC (rev 12217)
@@ -65,6 +65,10 @@
if (size == 0)
{
tail = node;
+ }
+ else
+ {
+ tail.prev = node;
}
size++;
Modified: branches/Branch_2_2_AS7/tests/src/org/hornetq/tests/integration/client/ConsumerFilterTest.java
===================================================================
--- branches/Branch_2_2_AS7/tests/src/org/hornetq/tests/integration/client/ConsumerFilterTest.java 2012-02-28 16:44:34 UTC (rev 12216)
+++ branches/Branch_2_2_AS7/tests/src/org/hornetq/tests/integration/client/ConsumerFilterTest.java 2012-03-01 04:55:36 UTC (rev 12217)
@@ -249,4 +249,86 @@
locator.close();
}
+
+ public void testLinkedListOrder() throws Exception
+ {
+ ServerLocator locator = createInVMNonHALocator();
+
+ ClientSessionFactory sf = locator.createSessionFactory();
+
+ ClientSession session = sf.createSession();
+
+ session.start();
+
+ session.createQueue("foo", "foo", true);
+
+ ClientProducer producer = session.createProducer("foo");
+
+ ClientConsumer redConsumer = session.createConsumer("foo", "color='red'");
+
+ ClientConsumer anyConsumer = session.createConsumer("foo");
+
+ sendMessage(session, producer, "any", "msg1");
+
+ sendMessage(session, producer, "any", "msg2");
+
+ sendMessage(session, producer, "any", "msg3");
+
+ sendMessage(session, producer, "red", "msgRed4");
+
+ sendMessage(session, producer, "red", "msgRed5");
+
+ readConsumer("anyConsumer", anyConsumer);
+
+ readConsumer("anyConsumer", anyConsumer);
+
+ log.info("### closing consumer ###");
+
+ anyConsumer.close();
+
+ readConsumer("redConsumer", redConsumer);
+
+ readConsumer("redConsumer", redConsumer);
+
+ log.info("### recreating consumer ###");
+
+ anyConsumer = session.createConsumer("foo");
+
+ session.start();
+
+ readConsumer("anyConsumer", anyConsumer);
+
+ session.close();
+
+ sf.close();
+
+ locator.close();
+ }
+
+ /**
+ * @param consumer
+ * @throws HornetQException
+ */
+ private void readConsumer(String consumerName, ClientConsumer consumer) throws Exception
+ {
+ ClientMessage message = consumer.receive(5000);
+ assertNotNull(message);
+ System.out.println("consumer = " + consumerName + " message, color=" + message.getStringProperty("color") + ", msg = " + message.getStringProperty("value"));
+ message.acknowledge();
+ }
+
+ /**
+ * @param session
+ * @param producer
+ * @return
+ * @throws HornetQException
+ */
+ private void sendMessage(ClientSession session, ClientProducer producer, String color, String msg) throws Exception
+ {
+ ClientMessage anyMessage = session.createMessage(true);
+ anyMessage.putStringProperty("color", color);
+ anyMessage.putStringProperty("value", msg);
+ producer.send(anyMessage);
+ session.commit();
+ }
}
12 years, 2 months