Commit includes ControlLoopPolicy API and bugfixes

[policy/engine.git] / ECOMP-PDP-REST / src / main / java / org / openecomp / policy / pdp / rest / api / services / GetMetricsService.java

diff --git a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/api/services/GetMetricsService.java b/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/api/services/GetMetricsService.java
index 14812ed..d390df8 100644 (file)
--- a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/api/services/GetMetricsService.java
+++ b/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/api/services/GetMetricsService.java
@@ -81,11 +81,6 @@ public class GetMetricsService {
        }
 
        private void run() throws PolicyException {
-               // Check Validation.
-               /*
-                * if(!getValidation()){ LOGGER.error(message); throw new
-                * PolicyException(message); }
-                */
                // Get Result.
                try {
                        status = HttpStatus.OK;
@@ -124,7 +119,7 @@ public class GetMetricsService {
 
                                } catch (JsonException | IllegalStateException e) {
                                        message = XACMLErrorConstants.ERROR_DATA_ISSUE
-                                                       + " improper JSON object : " + json.toString();
+                                                       + " improper JSON object : " + json != null ? json.toString() : "JSON is null";
                                        LOGGER.error(message);
                                        metricsResponse.setResponseMessage(message);
                                        metricsResponse.setResponseCode(400);