Merge branch '3.x' of github.com:sofastack/sofa-hessian into sofaboot…

…-4.0-support
sofastack · Aug 21, 2023 · 7744812 · 7744812
2 parents e02ad97 + 39b1dcb
commit 7744812
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 7 deletions.
diff --git a/src/main/java/com/caucho/burlap/client/MicroBurlapOutput.java b/src/main/java/com/caucho/burlap/client/MicroBurlapOutput.java
@@ -399,7 +399,7 @@ else if (object instanceof byte[]) {
      */
     public void writeCustomObject(Object object)
         throws IOException {
-        throw new IOException("unexpected object: " + object);
+        throw new IOException("unexpected object: " + object.getClass().getName());
     }
 
     /**

diff --git a/src/main/java/com/caucho/hessian/io/AbstractDeserializer.java b/src/main/java/com/caucho/hessian/io/AbstractDeserializer.java
@@ -67,7 +67,7 @@ public Object readObject(AbstractHessianInput in)
         String className = getClass().getName();
 
         if (obj != null)
-            throw error(className + ": unexpected object " + obj.getClass().getName() + " (" + obj + ")");
+            throw error(className + ": unexpected object " + obj.getClass().getName());
         else
             throw error(className + ": unexpected null value");
     }
@@ -92,7 +92,7 @@ public Object readMap(AbstractHessianInput in)
         String className = getClass().getName();
 
         if (obj != null)
-            throw error(className + ": unexpected object " + obj.getClass().getName() + " (" + obj + ")");
+            throw error(className + ": unexpected object " + obj.getClass().getName());
         else
             throw error(className + ": unexpected null value");
     }

diff --git a/src/main/java/com/caucho/hessian/io/AbstractListDeserializer.java b/src/main/java/com/caucho/hessian/io/AbstractListDeserializer.java
@@ -60,7 +60,7 @@ public Object readObject(AbstractHessianInput in)
         Object obj = in.readObject();
 
         if (obj != null)
-            throw error("expected list at " + obj.getClass().getName() + " (" + obj + ")");
+            throw error("expected list at " + obj.getClass().getName());
         else
             throw error("expected list at null");
     }

diff --git a/src/main/java/com/caucho/hessian/io/AbstractMapDeserializer.java b/src/main/java/com/caucho/hessian/io/AbstractMapDeserializer.java
@@ -67,7 +67,7 @@ public Object readObject(AbstractHessianInput in)
         Object obj = in.readObject();
 
         if (obj != null)
-            throw error("expected map/object at " + obj.getClass().getName() + " (" + obj + ")");
+            throw error("expected map/object at " + obj.getClass().getName());
         else
             throw error("expected map/object at null");
     }

diff --git a/src/main/java/com/caucho/hessian/micro/MicroHessianOutput.java b/src/main/java/com/caucho/hessian/micro/MicroHessianOutput.java
@@ -382,7 +382,7 @@ else if (object instanceof byte[]) {
      */
     public void writeCustomObject(Object object)
         throws IOException {
-        throw new IOException("unexpected object: " + object);
+        throw new IOException("unexpected object: " + object.getClass().getName());
     }
 
     /**

diff --git a/src/main/java/com/caucho/hessian/server/HessianSkeleton.java b/src/main/java/com/caucho/hessian/server/HessianSkeleton.java
@@ -82,7 +82,8 @@ public HessianSkeleton(Object service, Class apiClass)
         _service = service;
 
         if (!apiClass.isAssignableFrom(service.getClass()))
-            throw new IllegalArgumentException("Service " + service + " must be an instance of " + apiClass.getName());
+            throw new IllegalArgumentException("Service " + service.getClass().getName() + " must be an instance of " +
+                apiClass.getName());
     }
 
     /**