reenabled mandatory tests

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/qpid.0-9@501559 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 11 insertions, 13 deletions

diff --git a/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java b/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java
index 60ec059336..2829344dd5 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java
@@ -212,12 +212,11 @@ public class HeadersExchange extends AbstractExchange
 
             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);
             }
diff --git a/java/systests/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java b/java/systests/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java
index 53200a517e..00a645628f 100644
--- a/java/systests/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java
+++ b/java/systests/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java
@@ -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 @@ public class HeadersExchangeTest extends AbstractHeadersExchangeTestBase
 
         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 @@ public class HeadersExchangeTest extends AbstractHeadersExchangeTestBase
         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);
     }