home/pinpoint
2
0
Fork 0
mirror of https://github.com/wahyd4/pinpoint.git synced 2026-08-17 00:36:02 +10:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #334 from denzelsN/1.0.x

Browse Source 
fixed conflict
This commit is contained in:
denzelsN
2015-04-16 10:34:52 +09:00
parent 611ee8c0f8 c4b48c7bf3
commit 8666d8a8dd
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
web/src/main/java/com/navercorp/pinpoint/web/controller/MapController.java
-5
View File
@@ -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);