Do not interfere with HTTP 400 if it does not have an ErrorResponse

Signed-off-by: Alin Dreghiciu <adreghiciu@gmail.com>
sonatype · Nov 21, 2012 · fba0a29 · fba0a29
1 parent 43b215d
commit fba0a29
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/.../main/java/org/sonatype/nexus/client/internal/rest/jersey/NexusUniformRequestBuilder.java b/.../main/java/org/sonatype/nexus/client/internal/rest/jersey/NexusUniformRequestBuilder.java
@@ -586,18 +586,17 @@ private <T> T handle( final Operation<T> callable )
                 {
                     if ( response.hasEntity() )
                     {
+                        final ErrorResponse errorResponse;
                         try
                         {
-                            throw new BadRequestException( response.getEntity( ErrorResponse.class ) );
+                            errorResponse = response.getEntity( ErrorResponse.class );
                         }
-                        catch ( ClientHandlerException ignore )
+                        catch ( final Exception ignore )
                         {
-                            // ignore as we do have an error response
-                        }
-                        catch ( UniformInterfaceException ignore )
-                        {
-                            // ignore as we do have an error response
+                            // we can't convert, so let it flow
+                            throw e;
                         }
+                        throw new BadRequestException( errorResponse );
                     }
                 }
                 else if ( response.getStatus() == ClientResponse.Status.NOT_FOUND.getStatusCode() )