Merge "AbstractConfigTest - exposed BundleContext and ServiceRegistration mock."

[controller.git] / opendaylight / md-sal / sal-rest-connector / src / main / java / org / opendaylight / controller / sal / rest / impl / JsonToCompositeNodeProvider.java

diff --git a/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/rest/impl/JsonToCompositeNodeProvider.java b/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/rest/impl/JsonToCompositeNodeProvider.java
index daaedd92b8d6c85f05f26365b90f6bbe68f7d5d6..dea4a73cd17d23f53f7c88d9b2ace669b285a2a6 100644 (file)
--- a/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/rest/impl/JsonToCompositeNodeProvider.java
+++ b/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/rest/impl/JsonToCompositeNodeProvider.java
@@ -35,8 +35,8 @@ public enum JsonToCompositeNodeProvider implements MessageBodyReader<CompositeNo
         JsonReader jsonReader = new JsonReader();
         try {
             return jsonReader.read(entityStream);
-        } catch (UnsupportedJsonFormatException e) {
-            throw new WebApplicationException(Response.status(Response.Status.BAD_REQUEST)
+        } catch (UnsupportedFormatException e) {
+            throw new WebApplicationException(e,Response.status(Response.Status.BAD_REQUEST)
                     .entity(e.getMessage()).build());
         }
     }