[Red5commits] [1641] added support for object encoding "AMF3.TYPE_OBJECT_PROPERTY"

[jbauch]

added support for object encoding "AMF3.TYPE_OBJECT_PROPERTY"


Timestamp: 01/21/07 16:33:48 EST (3 days ago) 
Change: 1641 
Author: jbauch

Files (see diff or trac for details): 
java/server/branches/joachim_amf3_integration/src/org/red5/io/amf3/Input.java
java/server/branches/joachim_amf3_integration/src/org/red5/io/amf3/Output.java


Trac: http://mirror1.cvsdude.com/trac/osflash/red5/changeset/1641

Index: /java/server/branches/joachim_amf3_integration/src/org/red5/io/amf3/Input.java
===================================================================
--- /java/server/branches/joachim_amf3_integration/src/org/red5/io/amf3/Input.java (revision 1639)
+++ /java/server/branches/joachim_amf3_integration/src/org/red5/io/amf3/Input.java (revision 1641)
@@ -291,4 +291,12 @@
 			switch (type & 0x03) {
 			case AMF3.TYPE_OBJECT_PROPERTY:
+				int count = type >> 2;
+				List<String> propertyNames = new ArrayList<String>(count);
+				for (int i=0; i<count; i++) {
+					propertyNames.add(readString());					
+				}
+				for (int i=0; i<count; i++) {
+					resultMap.put(propertyNames.get(i), deserializer.deserialize(this));					
+				}
 				break;
 			case AMF3.TYPE_OBJECT_ANONYMOUS_PROPERTY:
Index: /java/server/branches/joachim_amf3_integration/src/org/red5/io/amf3/Output.java
===================================================================
--- /java/server/branches/joachim_amf3_integration/src/org/red5/io/amf3/Output.java (revision 1640)
+++ /java/server/branches/joachim_amf3_integration/src/org/red5/io/amf3/Output.java (revision 1641)
@@ -33,4 +33,5 @@
 import org.apache.mina.common.ByteBuffer;
 import org.red5.io.amf.AMF;
+import org.red5.io.object.RecordSet;
 import org.red5.io.object.Serializer;
 
@@ -329,4 +330,9 @@
 
     /** {@inheritDoc} */
+    public void writeRecordSet(RecordSet recordset, Serializer serializer) {
+    	writeString("Not implemented.");
+    }
+
+    /** {@inheritDoc} */
 	public void writeXML(String xml) {
 		writeAMF3();


Note:
Diffs are chopped if more than 25k.
This is to get past the limit on the mailing list.