1 files changed, 28 insertions, 35 deletions

diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersBinding.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersBinding.java
index f58a6513a9..b6f5f973f4 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersBinding.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersBinding.java
@@ -20,17 +20,18 @@
  */
 package org.apache.qpid.server.exchange;
 
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
 import org.apache.log4j.Logger;
+
 import org.apache.qpid.framing.AMQTypedValue;
 import org.apache.qpid.framing.FieldTable;
 import org.apache.qpid.server.binding.Binding;
 import org.apache.qpid.server.message.AMQMessageHeader;
 
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
 /**
  * Defines binding and matching based on a set of headers.
  */
@@ -38,7 +39,7 @@ class HeadersBinding
 {
     private static final Logger _logger = Logger.getLogger(HeadersBinding.class);
 
-    private final FieldTable _mappings;
+    private final Map<String,Object> _mappings;
     private final Binding _binding;
     private final Set<String> required = new HashSet<String>();
     private final Map<String,Object> matches = new HashMap<String,Object>();
@@ -57,7 +58,7 @@ class HeadersBinding
         _binding = binding;
         if(_binding !=null)
         {
-            _mappings = FieldTable.convertToFieldTable(_binding.getArguments());
+            _mappings = _binding.getArguments();
             initMappings();
         }
         else
@@ -68,37 +69,23 @@ class HeadersBinding
     
     private void initMappings()
     {
-        _mappings.processOverElements(new FieldTable.FieldTableElementProcessor()
+        for(Map.Entry<String, Object> entry : _mappings.entrySet())
         {
-
-            public boolean processElement(String propertyName, AMQTypedValue value)
+            String propertyName = entry.getKey();
+            Object value = entry.getValue();
+            if (isSpecial(propertyName))
             {
-                if (isSpecial(propertyName))
-                {
-                    processSpecial(propertyName, value.getValue());
-                }
-                else if (value.getValue() == null || value.getValue().equals(""))
-                {
-                    required.add(propertyName);
-                }
-                else
-                {
-                    matches.put(propertyName,value.getValue());
-                }
-
-                return true;
+                processSpecial(propertyName, value);
             }
-
-            public Object getResult()
+            else if (value == null || value.equals(""))
             {
-                return null;
+                required.add(propertyName);
             }
-        });
-    }
-
-    protected FieldTable getMappings()
-    {
-        return _mappings;
+            else
+            {
+                matches.put(propertyName,value);
+            }
+        }
     }
     
     public Binding getBinding()
@@ -206,8 +193,14 @@ class HeadersBinding
     {
         if(value instanceof String)
         {
-            if("any".equalsIgnoreCase((String) value)) return true;
-            if("all".equalsIgnoreCase((String) value)) return false;
+            if("any".equalsIgnoreCase((String) value))
+            {
+                return true;
+            }
+            if("all".equalsIgnoreCase((String) value))
+            {
+                return false;
+            }
         }
         _logger.warn("Ignoring unrecognised match type: " + value);
         return false;//default to all