diff --git a/src/main/java/com/nhn/pinpoint/web/controller/ScatterChartController.java b/src/main/java/com/nhn/pinpoint/web/controller/ScatterChartController.java index d44349d51..54ff20403 100644 --- a/src/main/java/com/nhn/pinpoint/web/controller/ScatterChartController.java +++ b/src/main/java/com/nhn/pinpoint/web/controller/ScatterChartController.java @@ -134,7 +134,7 @@ public class ScatterChartController { } else { resultRange = new Range(limitedScanResult.getLimitedTime(), range.getTo()); } - return createModelAndVeiw(resultRange, jsonpCallback, scatterData); + return createModelAndView(resultRange, jsonpCallback, scatterData); } private ModelAndView selectScatterData(String applicationName, Range range, int limit, String jsonpCallback) { @@ -146,10 +146,10 @@ public class ScatterChartController { } else { resultRange = new Range(scatterData.get(scatterData.size() - 1).getAcceptedTime(), range.getTo()); } - return createModelAndVeiw(resultRange, jsonpCallback, scatterData); + return createModelAndView(resultRange, jsonpCallback, scatterData); } - private ModelAndView createModelAndVeiw(Range range, String jsonpCallback, List scatterData) { + private ModelAndView createModelAndView(Range range, String jsonpCallback, List scatterData) { ModelAndView mv = new ModelAndView(); mv.addObject("resultFrom", range.getFrom()); mv.addObject("resultTo", range.getTo()); diff --git a/src/main/java/com/nhn/pinpoint/web/util/MappingJackson2JsonpView.java b/src/main/java/com/nhn/pinpoint/web/util/MappingJackson2JsonpView.java index 78a3ce61a..85b127f98 100644 --- a/src/main/java/com/nhn/pinpoint/web/util/MappingJackson2JsonpView.java +++ b/src/main/java/com/nhn/pinpoint/web/util/MappingJackson2JsonpView.java @@ -32,7 +32,7 @@ public class MappingJackson2JsonpView extends MappingJackson2JsonView { /** * Default content type. Overridable as bean property. */ - public static final String DEFAULT_CONTENT_TYPE = "application/json"; + public static final String DEFAULT_CONTENT_TYPE = "application/jsonp"; private ObjectMapper objectMapper = new ObjectMapper(); diff --git a/src/main/resources/servlet-context.xml b/src/main/resources/servlet-context.xml index 019fce639..dff78edf2 100644 --- a/src/main/resources/servlet-context.xml +++ b/src/main/resources/servlet-context.xml @@ -42,18 +42,16 @@ - - - - - - - - + + + + + + \ No newline at end of file