[royale-asjs] branch develop updated: Revert "Fix 2 AMF issues in JS build:"

[ca...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

carlosrovira pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git


The following commit(s) were added to refs/heads/develop by this push:
     new a120059  Revert "Fix 2 AMF issues in JS build:"
a120059 is described below

commit a120059d9f6241f2d2b5903774ebc9061b2ac3c5
Author: Carlos Rovira <ca...@apache.org>
AuthorDate: Wed Jan 6 11:47:36 2021 +0100

    Revert "Fix 2 AMF issues in JS build:"
    
    This reverts commit 8df32a2c3359eebb661c0329557c6d59d0bdfe0e.
---
 .../projects/MXRoyale/src/main/royale/mx/net/NetConnection.as  |  3 +--
 .../org/apache/royale/net/remoting/amf/AMFNetConnection.as     | 10 +---------
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/net/NetConnection.as b/frameworks/projects/MXRoyale/src/main/royale/mx/net/NetConnection.as
index d0e84ac..fca0bdc 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/net/NetConnection.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/net/NetConnection.as
@@ -150,8 +150,7 @@ public class NetConnection extends EventDispatcher
         var ncResponder:org.apache.royale.net.Responder = 
                         new org.apache.royale.net.Responder(responder.resultFunction,
                                                               responder.faultFunction);
-        // Jim P: pass the AMF target URI in here 
-        nc.call(thisObject as String, ncResponder, message);
+        nc.call(null, ncResponder, message);
     }
 }
 
diff --git a/frameworks/projects/Network/src/main/royale/org/apache/royale/net/remoting/amf/AMFNetConnection.as b/frameworks/projects/Network/src/main/royale/org/apache/royale/net/remoting/amf/AMFNetConnection.as
index a28538b..d176fcc 100644
--- a/frameworks/projects/Network/src/main/royale/org/apache/royale/net/remoting/amf/AMFNetConnection.as
+++ b/frameworks/projects/Network/src/main/royale/org/apache/royale/net/remoting/amf/AMFNetConnection.as
@@ -287,11 +287,7 @@ public class AMFNetConnection
      *  @productversion BlazeDS 4
      *  @productversion LCDS 3
      */
-    /* JimP: params should match what is sent into NetConnection.call, which is currently an IMessage.
-       If a 'rest' variable is used then only the first member of a passed array arrives. Fixed by
-       changing to an Object.
-    */
-    public function call(command:String, responder:Responder, params:Object):void
+    public function call(command:String, responder:Responder, ... params):void
     {
         COMPILE::SWF
         {
@@ -305,8 +301,6 @@ public class AMFNetConnection
             requestQueue.push(
                     {
                         url: url,
-                        /* JimP: this is the AMF URI */
-                        target: command,
                         responder: responder,
                         args: params
                     }
@@ -334,8 +328,6 @@ public class AMFNetConnection
             var actionMessage:ActionMessage = new ActionMessage();
             var messageBody:MessageBody = new MessageBody();
             sequence++;
-            /* insert the AMF URI into the body, otherwise it's always 'null' */
-            messageBody.targetURI = call.item.target;
             messageBody.responseURI = "/" + sequence.toString();
             messageBody.data = args;
             actionMessage.bodies = [ messageBody ];