refactor(ProjectController): fix logMessageAndHalt invocation

landonreed · landonreed · commit bea6caf91df8 · 2020-03-16T11:09:31.000-04:00
diff --git a/src/main/java/com/conveyal/datatools/manager/controllers/api/ProjectController.java b/src/main/java/com/conveyal/datatools/manager/controllers/api/ProjectController.java
@@ -252,9 +252,7 @@ static String mergeProjectFeeds(Request req, Response res) {
                     logMessageAndHalt(
                         req,
                         HttpStatus.BAD_REQUEST_400,
-                        "Merge feeds job aborted. Regional merge already exists for latest feed versions found in project.",
-                        null,
-                        "path/to/feedSource"
+                        "Merge feeds job aborted. Regional merge already exists for latest feed versions found in project."
                         );
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -252,9 +252,7 @@ static String mergeProjectFeeds(Request req, Response res) {`
`252`	`252`	`logMessageAndHalt(`
`253`	`253`	`req,`
`254`	`254`	`HttpStatus.BAD_REQUEST_400,`
`255`		`- "Merge feeds job aborted. Regional merge already exists for latest feed versions found in project.",`
`256`		`- null,`
`257`		`- "path/to/feedSource"`
	`255`	`+ "Merge feeds job aborted. Regional merge already exists for latest feed versions found in project."`
`258`	`256`	`);`
`259`	`257`	`}`
`260`	`258`	`}`