Fixes #2861: Pass the IServiceProvider to ODataUriParser

OData · Nov 20, 2024 · 3acc028 · 3acc028
1 parent 1595edb
commit 3acc028
Showing 1 changed file with 21 additions and 2 deletions.
diff --git a/...crosoft.AspNet.OData.Shared/Formatter/Deserialization/ODataResourceDeserializerHelpers.cs b/...crosoft.AspNet.OData.Shared/Formatter/Deserialization/ODataResourceDeserializerHelpers.cs
@@ -91,7 +91,17 @@ internal static ODataDeserializerContext GenerateNestedReadContext(ODataNestedRe
                     {
                         try
                         {
-                            path = new Routing.ODataPath(new ODataUriParser(readContext.Model, new Uri(navigationSource.Path.Path, UriKind.Relative)).ParsePath());
+                            ODataUriParser parser;
+                            if (readContext != null && readContext.InternalRequest != null && readContext.InternalRequest.RequestContainer != null)
+                            {
+                                parser = new ODataUriParser(readContext.Model, new Uri(navigationSource.Path.Path, UriKind.Relative), readContext.InternalRequest.RequestContainer);
+                            }
+                            else
+                            {
+                                parser = new ODataUriParser(readContext.Model, new Uri(navigationSource.Path.Path, UriKind.Relative));
+                            }
+
+                            path = new Routing.ODataPath(parser.ParsePath());
                         }
                         catch (ODataException)
                         {
@@ -332,7 +342,16 @@ internal static Routing.ODataPath ApplyIdToPath(ODataDeserializerContext readCon
 
                     try
                     {
-                        ODataUriParser parser = new ODataUriParser(readContext.Model, new Uri(serviceRoot), resourceWrapper.ResourceBase.Id);
+                        ODataUriParser parser;
+                        if (internalRequest.RequestContainer != null)
+                        {
+                            parser = new ODataUriParser(readContext.Model, new Uri(serviceRoot), resourceWrapper.ResourceBase.Id, internalRequest.RequestContainer);
+                        }
+                        else
+                        {
+                            parser = new ODataUriParser(readContext.Model, new Uri(serviceRoot), resourceWrapper.ResourceBase.Id);
+                        }
+
                         odataPath = parser.ParsePath();
                     }
                     catch (ODataException)