You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by jo...@apache.org on 2024/02/02 22:01:45 UTC

(royale-compiler) 01/02: RemoteObject and WebService nodes consistently check operation/method tags for short name and URI

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

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

commit 5466c9f0d4e336d5cb8532f760e42a57dbd02e0f
Author: Josh Tynjala <jo...@apache.org>
AuthorDate: Fri Feb 2 13:43:00 2024 -0800

    RemoteObject and WebService nodes consistently check operation/method tags for short name and URI
---
 .../apache/royale/compiler/internal/tree/mxml/MXMLRemoteObjectNode.java | 2 +-
 .../apache/royale/compiler/internal/tree/mxml/MXMLWebServiceNode.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/compiler/src/main/java/org/apache/royale/compiler/internal/tree/mxml/MXMLRemoteObjectNode.java b/compiler/src/main/java/org/apache/royale/compiler/internal/tree/mxml/MXMLRemoteObjectNode.java
index edc1d724b..787524451 100644
--- a/compiler/src/main/java/org/apache/royale/compiler/internal/tree/mxml/MXMLRemoteObjectNode.java
+++ b/compiler/src/main/java/org/apache/royale/compiler/internal/tree/mxml/MXMLRemoteObjectNode.java
@@ -63,7 +63,7 @@ class MXMLRemoteObjectNode extends MXMLInstanceNode implements IMXMLRemoteObject
     protected void processChildTag(MXMLTreeBuilder builder, IMXMLTagData tag, IMXMLTagData childTag, MXMLNodeInfo info)
     {
         // Create MXMLRemoteObjectMethodNode for a {@code <method>} child tag.
-        if (childTag.getShortName().equals(TAG_METHOD))
+        if (TAG_METHOD.equals(childTag.getShortName()) && childTag.getURI().equals(tag.getURI()))
         {
             final RoyaleProject project = builder.getProject();
             final XMLName name = new XMLName(childTag.getXMLName().getXMLNamespace(), BASENAME_REMOTE_OBJECT_METHOD);
diff --git a/compiler/src/main/java/org/apache/royale/compiler/internal/tree/mxml/MXMLWebServiceNode.java b/compiler/src/main/java/org/apache/royale/compiler/internal/tree/mxml/MXMLWebServiceNode.java
index 7d6ada7ed..b3560742e 100644
--- a/compiler/src/main/java/org/apache/royale/compiler/internal/tree/mxml/MXMLWebServiceNode.java
+++ b/compiler/src/main/java/org/apache/royale/compiler/internal/tree/mxml/MXMLWebServiceNode.java
@@ -63,7 +63,7 @@ class MXMLWebServiceNode extends MXMLInstanceNode implements IMXMLWebServiceNode
     protected void processChildTag(MXMLTreeBuilder builder, IMXMLTagData tag, IMXMLTagData childTag, MXMLNodeInfo info)
     {
         // Create MXMLWebServiceOperationNode for an {@code <operation>} child tag.
-        if (childTag.getShortName().equals(TAG_OPERATION))
+        if (TAG_OPERATION.equals(childTag.getShortName()) && childTag.getURI().equals(tag.getURI()))
         {
             final RoyaleProject project = builder.getProject();
             final XMLName name = new XMLName(childTag.getXMLName().getXMLNamespace(), BASENAME_WEB_SERVICE_OPERATION);