diff --git a/src/main/java/org/ecocean/servlet/MergeIndividual.java b/src/main/java/org/ecocean/servlet/MergeIndividual.java index 1decec0fb7..4116c77aeb 100644 --- a/src/main/java/org/ecocean/servlet/MergeIndividual.java +++ b/src/main/java/org/ecocean/servlet/MergeIndividual.java @@ -43,7 +43,7 @@ public void doPost(HttpServletRequest request, HttpServletResponse response) "Error: Missing two valid individualIDs for MergeIndividual. "; if (id1 == null) msg += "
Bad id1: " + id1; if (id2 == null) msg += "
Bad id2: " + id2; - errorAndClose(msg, response); + errorAndClose(msg, response,out); return; } String oldName1; @@ -64,7 +64,7 @@ public void doPost(HttpServletRequest request, HttpServletResponse response) "Error: Could not find both individuals in our database. "; if (mark1 == null) msg += "
could not find individual " + mark1; if (mark2 == null) msg += "
could not find individual " + mark2; - errorAndClose(msg, response); + errorAndClose(msg, response,out); myShepherd.rollbackDBTransaction(); myShepherd.closeDBTransaction(); return; @@ -165,7 +165,7 @@ public void doPost(HttpServletRequest request, HttpServletResponse response) } } catch (Exception le) { le.printStackTrace(); - errorAndClose("An exception occurred. Please contact the admins.", response); + errorAndClose("An exception occurred. Please contact the admins.", response, out); myShepherd.rollbackDBTransaction(); myShepherd.closeDBTransaction(); return; @@ -194,11 +194,11 @@ public void doPost(HttpServletRequest request, HttpServletResponse response) } else { errorAndClose( "Failure! This encounter is currently being modified by another user, or an exception occurred. Please wait a few seconds before trying to modify this encounter again.", - response); + response,out); } } - private void errorAndClose(String msg, HttpServletResponse response) { + private void errorAndClose(String msg, HttpServletResponse response, PrintWriter out) { // out.println(ServletUtilities.getHeader(request)); out.println(msg); // out.println("

Return to