Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update AMFBinaryData.as #239

Merged
merged 1 commit into from May 18, 2018
Merged

Update AMFBinaryData.as #239

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
24 changes: 16 additions & 8 deletions ...orks/projects/Network/src/main/royale/org/apache/royale/net/remoting/amf/AMFBinaryData.as
View file
Open in desktop
Expand Up @@ -150,6 +150,8 @@ public class AMFBinaryData
private var stringCount:int = 0;
private var traitCount:int = 0;
private var objectCount:int = 0;

private var flexTraitFound:Boolean = false;

public var pos:int = 0;

Expand Down Expand Up @@ -871,11 +873,20 @@ public class AMFBinaryData
{
var ref:int = this.readUInt29();
if ((ref & 1) == 0)
return this.getObject(ref >> 1);
{
this.flexTraitFound = false;
return this.getObject(ref >> 1);
}
else
{
var traits:Traits = this.readTraits(ref);
var obj:Object;
if (traits.alias == "flex.messaging.io.ArrayCollection"
|| traits.alias == "flex.messaging.io.ObjectProxy")
{
traits.alias = "";
this.flexTraitFound = true;
}
var obj:Object;
if (traits.alias) {
var c:Class = getClassByAlias(traits.alias);
if (c)
Expand All @@ -892,13 +903,10 @@ public class AMFBinaryData
}
this.rememberObject(obj);
if (traits.externalizable)
{
if (obj[CLASS_ALIAS] == "flex.messaging.io.ArrayCollection"
|| obj[CLASS_ALIAS] == "flex.messaging.io.ObjectProxy")
return this.readObject();
if (this.flexTraitFound)
obj = this.readObject();
else
obj[EXTERNALIZED_FIELD] = this.readObject();
}
obj[EXTERNALIZED_FIELD] = this.readObject();
else
{
for (var i:int in traits.props)
Expand Down