You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rh...@apache.org on 2007/01/30 21:54:45 UTC
svn commit: r501559 - in /incubator/qpid/branches/qpid.0-9/java:
broker/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java
systests/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java
Author: rhs
Date: Tue Jan 30 12:54:44 2007
New Revision: 501559
URL: http://svn.apache.org/viewvc?view=rev&rev=501559
Log:
reenabled mandatory tests
Modified:
incubator/qpid/branches/qpid.0-9/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java
incubator/qpid/branches/qpid.0-9/java/systests/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java
Modified: incubator/qpid/branches/qpid.0-9/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java?view=diff&rev=501559&r1=501558&r2=501559
==============================================================================
--- incubator/qpid/branches/qpid.0-9/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java (original)
+++ incubator/qpid/branches/qpid.0-9/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java Tue Jan 30 12:54:44 2007
@@ -212,12 +212,11 @@
String msg = "Exchange " + getName() + ": message not routable.";
- // XXX
- /* if (payload.getTransferBody().mandatory)
+ if (payload.getTransferBody().mandatory)
{
throw new NoRouteException(msg, payload);
}
- else*/
+ else
{
_logger.warn(msg);
}
Modified: incubator/qpid/branches/qpid.0-9/java/systests/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/java/systests/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java?view=diff&rev=501559&r1=501558&r2=501559
==============================================================================
--- incubator/qpid/branches/qpid.0-9/java/systests/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java (original)
+++ incubator/qpid/branches/qpid.0-9/java/systests/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java Tue Jan 30 12:54:44 2007
@@ -21,6 +21,7 @@
package org.apache.qpid.server.exchange;
import org.apache.qpid.AMQException;
+import org.apache.qpid.framing.MessageTransferBody;
import org.apache.qpid.server.registry.ApplicationRegistry;
import org.apache.qpid.server.util.TestApplicationRegistry;
@@ -53,15 +54,13 @@
Message m7 = new Message("Message7", "XXXXX");
- // I couldn't find mandatory or the equivalent of mandatory in the transfer method
-
- //BasicPublishBody pb7 = m7.getPublishBody();
- //pb7.mandatory = true;
+ MessageTransferBody tb7 = m7.getTransferBody();
+ tb7.mandatory = true;
routeAndTest(m7,true);
Message m8 = new Message("Message8", "F0000");
- //BasicPublishBody pb8 = m8.getPublishBody();
- //pb8.mandatory = true;
+ MessageTransferBody tb8 = m8.getTransferBody();
+ tb8.mandatory = true;
routeAndTest(m8,false,q1);
}
@@ -86,10 +85,10 @@
bindDefault("F0000");
Message m1 = new Message("Message1", "XXXXX");
Message m2 = new Message("Message2", "F0000");
- //BasicPublishBody pb1 = m1.getPublishBody();
- //pb1.mandatory = true;
- //BasicPublishBody pb2 = m2.getPublishBody();
- //pb2.mandatory = true;
+ MessageTransferBody tb1 = m1.getTransferBody();
+ tb1.mandatory = true;
+ MessageTransferBody tb2 = m2.getTransferBody();
+ tb2.mandatory = true;
routeAndTest(m1,true);
}