| Chunk |
|---|
| Conflicting content |
|---|
response.sendRedirect("funds.jsp?msg=8");
}
else {
<<<<<<< HEAD
user.getInvestments().get(i).setPrice(Double.parseDouble(request.getParameter("price")));
user.getInvestments().get(i).setSelling(new Boolean(request.getParameter("selling") != null));
=======
investments.get(i).setPrice(Double.parseDouble(request.getParameter("price").replace(",",".")));
investments.get(i).setSelling(new Boolean(request.getParameter("selling") != null));
>>>>>>> 24f8b7fcf3a0586651e887431a86c23c13afd2d9
session = HibernateUtil.getSessionFactory().getCurrentSession();
session.beginTransaction();
session.update(user.getInvestments().get(i)); |
| Solution content |
|---|
response.sendRedirect("funds.jsp?msg=8");
}
else {
user.getInvestments().get(i).setPrice(Double.parseDouble(request.getParameter("price").replace(",",".")));
user.getInvestments().get(i).setSelling(new Boolean(request.getParameter("selling") != null));
session = HibernateUtil.getSessionFactory().getCurrentSession();
session.beginTransaction();
session.update(user.getInvestments().get(i)); |
| File |
|---|
| UserServlet.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Method invocation |