[fix]修正IPacket.ToStr()回收内存后缓冲区被清空的问题。所有单元测试通过

NewLifeX · Sep 12, 2024 · 9d1bb9e · 9d1bb9e
1 parent 6b9197c
commit 9d1bb9e
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/NewLife.Remoting/ApiClient.cs b/NewLife.Remoting/ApiClient.cs
@@ -305,7 +305,12 @@ public virtual Int32 InvokeOneWay(String action, Object? args = null, Byte flag
 
             if (message.Data == null) return default;
             if (resultType == typeof(IPacket)) return (TResult)(Object)message.Data;
-            if (resultType == typeof(Packet)) return (TResult)(Object)message.Data;
+            if (resultType == typeof(Packet))
+            {
+                if (message.Data is Packet) return (TResult)(Object)message.Data;
+
+                return (TResult)(Object)new Packet(message.Data.ToArray());
+            }
 
             try
             {

diff --git a/NewLife.Remoting/IApiHandler.cs b/NewLife.Remoting/IApiHandler.cs
@@ -250,7 +250,8 @@ public virtual ControllerContext Prepare(IApiSession session, String action, IPa
                 // 例如接口 Say(String text)，客户端可用 InvokeAsync<Object>("Say", "Hello NewLife!")
                 else if (args != null)
                 {
-                    ps[pi.Name] = args.ToStr().ChangeType(pi.ParameterType);
+                    //ps[pi.Name] = args.ToStr().ChangeType(pi.ParameterType);
+                    ps[pi.Name] = raw == null ? null : encoder.Convert(raw, pi.ParameterType);
 
                     return ps;
                 }

diff --git a/XUnitTest/ApiTest.cs b/XUnitTest/ApiTest.cs
@@ -162,16 +162,16 @@ public async void BigMessage()
 
     class BigController
     {
-        public Packet Test(Packet pk)
+        public IPacket Test(IPacket pk)
         {
             Assert.Equal(5 * 8 * 1024, pk.Total);
 
             var buf = pk.ReadBytes().Select(e => (Byte)(e ^ 'x')).ToArray();
 
-            return buf;
+            return (ArrayPacket)buf;
         }
 
-        public void TestOneWay(Packet pk)
+        public void TestOneWay(IPacket pk)
         {
             Assert.Equal(5 * 8 * 1024, pk.Total);
         }