From 4930a18293eaa4d19a5f068ca0e2ef127b4efc5c Mon Sep 17 00:00:00 2001 From: Andrea Turli Date: Thu, 14 Nov 2013 00:34:53 +0100 Subject: [PATCH] JCLOUDS-373: Change parent of SoftLayerOrderItemDuplicateException to HttpResponseException - SoftLayerOrderItemDuplicateException extends HttpResponseException as it is a propagated exception by jclouds --- .../exceptions/SoftLayerOrderItemDuplicateException.java | 10 +++++++--- .../org/jclouds/softlayer/handlers/SoftLayerErrorHandler.java | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/exceptions/SoftLayerOrderItemDuplicateException.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/exceptions/SoftLayerOrderItemDuplicateException.java index a08a61b..859baa5 100644 --- a/providers/softlayer/src/main/java/org/jclouds/softlayer/exceptions/SoftLayerOrderItemDuplicateException.java +++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/exceptions/SoftLayerOrderItemDuplicateException.java @@ -16,10 +16,14 @@ */ package org.jclouds.softlayer.exceptions; -public class SoftLayerOrderItemDuplicateException extends RuntimeException { +import org.jclouds.http.HttpCommand; +import org.jclouds.http.HttpResponse; +import org.jclouds.http.HttpResponseException; - public SoftLayerOrderItemDuplicateException(String message, Exception exception) { - super(message, exception); +public class SoftLayerOrderItemDuplicateException extends HttpResponseException { + + public SoftLayerOrderItemDuplicateException(HttpCommand command, HttpResponse response, String message) { + super(command, response, message); } } diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/handlers/SoftLayerErrorHandler.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/handlers/SoftLayerErrorHandler.java index 1d708a1..28b03e9 100644 --- a/providers/softlayer/src/main/java/org/jclouds/softlayer/handlers/SoftLayerErrorHandler.java +++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/handlers/SoftLayerErrorHandler.java @@ -66,7 +66,7 @@ public void handleError(HttpCommand command, HttpResponse response) { } else if (message.indexOf("currently an active transaction") != -1) { exception = new IllegalStateException(message, exception); } else if (message.indexOf("SoftLayer_Exception_Order_Item_Duplicate") != -1) { - exception = new SoftLayerOrderItemDuplicateException(message, exception); + exception = new SoftLayerOrderItemDuplicateException(command, response, message); } } } -- 1.8.4