From c4b48c7bf34e5d316e378a6e6250da857390c4fa Mon Sep 17 00:00:00 2001 From: denz Date: Thu, 16 Apr 2015 10:28:36 +0900 Subject: [PATCH] fixed conflict --- .../com/navercorp/pinpoint/web/controller/MapController.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/web/src/main/java/com/navercorp/pinpoint/web/controller/MapController.java b/web/src/main/java/com/navercorp/pinpoint/web/controller/MapController.java index da9a6e90a..5b1864c82 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/controller/MapController.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/controller/MapController.java @@ -196,13 +196,8 @@ public class MapController { @RequestParam("targetApplicationName") String targetApplicationName, @RequestParam("targetServiceTypeName") String targetServiceTypeName) { -<<<<<<< HEAD - final Application sourceApplication = new Application(sourceApplicationName, sourceServiceType); - final Application destinationApplication = new Application(targetApplicationName, targetServiceType); -======= final Application sourceApplication = new Application(sourceApplicationName, registry.findServiceTypeByName(sourceServiceTypeName)); final Application destinationApplication = new Application(targetApplicationName, registry.findServiceTypeByName(targetServiceTypeName)); ->>>>>>> 18c9bcf... added request mappings to support serviceTypeName parameters final Range range = new Range(from, to); NodeHistogram nodeHistogram = mapService.linkStatistics(sourceApplication, destinationApplication, range);