Projects >> jcommune >>43114ad8cc6edf7858e73978ff3139707dc506cc

Chunk
Conflicting content 
    /**
     * Get all topics past last 24 hour.
     *
<<<<<<< HEAD
     * @param start     start index of topic
     * @param max       number of topics
=======
     * @param start start index of topic
     * @param max   number of topics
>>>>>>> e7ddc2df33a4aae05829a1bc30745da82ea55f42
     * @param lastLogin user's last login date and time
     * @return list of topics
     */
Solution content 
    /**
     * Get all topics past last 24 hour.
     *
     * @param start start index of topic
     * @param max   number of topics
     * @param lastLogin user's last login date and time
     * @return list of topics
     */
File
TopicDao.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
    @RequestMapping(value = "/topics/recent", method = RequestMethod.GET)
    public ModelAndView show(@RequestParam(value = PAGE, required = false) Integer page,
                             @RequestParam(value = "size", required = false) Integer size, HttpSession session)
<<<<<<< HEAD
            throws NotFoundException {
=======
        throws NotFoundException {
>>>>>>> e7ddc2df33a4aae05829a1bc30745da82ea55f42
        DateTime lastLogin = (DateTime) session.getAttribute("lastlogin");
        int topicsCount = topicService.getTopicsPastLastDayCount(lastLogin);
Solution content 
    @RequestMapping(value = "/topics/recent", method = RequestMethod.GET)
    public ModelAndView show(@RequestParam(value = PAGE, required = false) Integer page,
                             @RequestParam(value = "size", required = false) Integer size, HttpSession session)
        throws NotFoundException {

        DateTime lastLogin = (DateTime) session.getAttribute("lastlogin");
        int topicsCount = topicService.getTopicsPastLastDayCount(lastLogin);
File
BranchController.java
Developer's decision
Version 1
Kind of conflict
Other
Chunk
Conflicting content 
     * @return {@code ModelAndView}
     * @throws org.jtalks.jcommune.service.exceptions.NotFoundException
     *          when topic or branch not found
<<<<<<< HEAD
     * @throws org.jtalks.jcommune.service.exceptions.InvalidHttpSessionException
     *          when session is invalid
=======
>>>>>>> e7ddc2df33a4aae05829a1bc30745da82ea55f42
     */
    @RequestMapping(value = "/topics/{topicId}", method = RequestMethod.GET)
    public ModelAndView show(@PathVariable(TOPIC_ID) Long topicId,
Solution content 
     * @return {@code ModelAndView}
     * @throws org.jtalks.jcommune.service.exceptions.NotFoundException
     *          when topic or branch not found
     */
    @RequestMapping(value = "/topics/{topicId}", method = RequestMethod.GET)
    public ModelAndView show(@PathVariable(TOPIC_ID) Long topicId,
File
TopicController.java
Developer's decision
Version 2
Kind of conflict
Comment
Chunk
Conflicting content 
        if (user.getLanguage() != null) {
            lang = user.getLanguage().substring(0, 2);
        }
<<<<<<< HEAD
        if (getDefaultTargetUrl().contains("?lang=")) {
=======
        if (getDefaultTargetUrl().contains(LANG_PARAM)) {
>>>>>>> e7ddc2df33a4aae05829a1bc30745da82ea55f42
            String temp;
            temp = getDefaultTargetUrl().substring(0, getDefaultTargetUrl().indexOf(LANG_PARAM)) +
                    getDefaultTargetUrl().substring(getDefaultTargetUrl().indexOf(LANG_PARAM) + 8);
Solution content 
        if (user.getLanguage() != null) {
            lang = user.getLanguage().substring(0, 2);
        }
        if (getDefaultTargetUrl().contains(LANG_PARAM)) {
            String temp;
            temp = getDefaultTargetUrl().substring(0, getDefaultTargetUrl().indexOf(LANG_PARAM)) +
                    getDefaultTargetUrl().substring(getDefaultTargetUrl().indexOf(LANG_PARAM) + 8);
File
SuccessfulAuthenticationHandler.java
Developer's decision
Version 2
Kind of conflict
If statement