From 6834024021c2cd90f02649d47e0a2339aed432d9 Mon Sep 17 00:00:00 2001
From: Rui Han <ruhan@redhat.com>
Date: Thu, 18 Jul 2024 09:44:05 +0800
Subject: [PATCH] Update error message (#101)

---
 .../client/ErrorResponseExceptionMapper.java    | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/commonjava/service/promote/client/ErrorResponseExceptionMapper.java b/src/main/java/org/commonjava/service/promote/client/ErrorResponseExceptionMapper.java
index b99a596..fa7d86d 100644
--- a/src/main/java/org/commonjava/service/promote/client/ErrorResponseExceptionMapper.java
+++ b/src/main/java/org/commonjava/service/promote/client/ErrorResponseExceptionMapper.java
@@ -38,15 +38,22 @@ public RuntimeException toThrowable(Response response)
         if (response.getStatus() == 500)
         {
             Object entity = response.getEntity();
-            if (entity instanceof InputStream)
+            if (entity != null)
             {
-                try (InputStream is = (InputStream) entity)
+                if (entity instanceof InputStream)
                 {
-                    throw new WebApplicationException(IOUtils.toString(is, Charset.defaultCharset()));
+                    try (InputStream is = (InputStream) entity)
+                    {
+                        throw new WebApplicationException(IOUtils.toString(is, Charset.defaultCharset()));
+                    }
+                    catch (IOException e)
+                    {
+                        throw new WebApplicationException("Unknown error, " + e.getMessage());
+                    }
                 }
-                catch (IOException e)
+                else
                 {
-                    throw new WebApplicationException("Unknown error");
+                    throw new WebApplicationException(entity.toString());
                 }
             }
             throw new WebApplicationException("Unknown error");