QPID-245 Field table now uses short strings only for interop, pending full proposal approval from AMQP

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@496626 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 8 insertions, 6 deletions

diff --git a/java/common/src/main/java/org/apache/qpid/framing/FieldTable.java b/java/common/src/main/java/org/apache/qpid/framing/FieldTable.java
index 147601b9f9..a6c21399a7 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/FieldTable.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/FieldTable.java
@@ -364,7 +364,7 @@ public class FieldTable
     public Object setByte(String string, byte b)
     {
         return setByte(new AMQShortString(string), b);
-    }    
+    }
 
     public Object setByte(AMQShortString string, byte b)
     {
@@ -453,7 +453,9 @@ public class FieldTable
 
     public Object setString(AMQShortString string, String value)
     {
-        checkPropertyName(string);
+        // temporary for interop until field table types are standardised
+        return setAsciiString(string, value);
+        /*checkPropertyName(string);
         if (value == null)
         {
             return setProperty(string, AMQType.VOID.asTypedValue(null));
@@ -469,7 +471,7 @@ public class FieldTable
 //            {
 //                return setProperty(string, AMQType.ASCII_STRING.asTypedValue(value));
 //            }
-        }
+        } */
     }
 
 
@@ -648,7 +650,7 @@ public class FieldTable
         }
     }
 
- 
+
     // *************************  Byte Buffer Processing
 
     public void writeToBuffer(ByteBuffer buffer)
@@ -823,7 +825,7 @@ public class FieldTable
     public void clear()
     {
         initMapIfNecessary();
-        _encodedForm = null;        
+        _encodedForm = null;
         _properties.clear();
         _encodedSize = 0;
     }
@@ -914,7 +916,7 @@ public class FieldTable
                 _properties.put(key,value);
 
 
-            
+
             }
             while (buffer.remaining() > expectedRemaining);