svn commit: r496626 - /incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/FieldTable.java

[rgreig]

Author: rgreig
Date: Tue Jan 16 00:58:58 2007
New Revision: 496626

URL: http://svn.apache.org/viewvc?view=rev&rev=496626
Log:
QPID-245 Field table now uses short strings only for interop, pending full 
proposal approval from AMQP

Modified:
    
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/FieldTable.java

Modified: 
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/FieldTable.java
URL: 
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/FieldTable.java?view=diff&rev=496626&r1=496625&r2=496626
==============================================================================
--- 
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/FieldTable.java
 (original)
+++ 
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/FieldTable.java
 Tue Jan 16 00:58:58 2007
@@ -364,7 +364,7 @@
     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 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 @@
 //            {
 //                return setProperty(string, 
AMQType.ASCII_STRING.asTypedValue(value));
 //            }
-        }
+        } */
     }
 
 
@@ -648,7 +650,7 @@
         }
     }
 
- 
+
     // *************************  Byte Buffer Processing
 
     public void writeToBuffer(ByteBuffer buffer)
@@ -823,7 +825,7 @@
     public void clear()
     {
         initMapIfNecessary();
-        _encodedForm = null;        
+        _encodedForm = null;
         _properties.clear();
         _encodedSize = 0;
     }
@@ -914,7 +916,7 @@
                 _properties.put(key,value);
 
 
-            
+
             }
             while (buffer.remaining() > expectedRemaining);