Improve relative path determination using Java 7 Paths

James Moger

2014-10-10 a74ddc24545ec45d0bb82ca2bb8f628ffdaa9da3

 src/main/java/com/gitblit/tickets/TicketNotifier.java

@@ -204,7 +204,9 @@
         } catch (Exception e) {
            Logger.getLogger(getClass()).error("failed to get changed paths", e);
         } finally {
            repo.close();
            if (repo != null) {
               repo.close();
            }
         }

         String compareUrl = ticketService.getCompareUrl(ticket, base, patchset.tip);
@@ -543,7 +545,6 @@
            }
         }
      }
      mailing.setRecipients(toAddresses);

      //
      // CC recipients
@@ -552,7 +553,7 @@

      // repository owners
      if (!ArrayUtils.isEmpty(repository.owners)) {
         tos.addAll(repository.owners);
         ccs.addAll(repository.owners);
      }

      // cc users mentioned in last comment
@@ -593,6 +594,14 @@
      }
      ccAddresses.addAll(settings.getStrings(Keys.mail.mailingLists));

      // respect the author's email preference
      UserModel lastAuthor = userManager.getUserModel(lastChange.author);
      if (!lastAuthor.getPreferences().isEmailMeOnMyTicketChanges()) {
         toAddresses.remove(lastAuthor.emailAddress);
         ccAddresses.remove(lastAuthor.emailAddress);
      }

      mailing.setRecipients(toAddresses);
      mailing.setCCs(ccAddresses);
   }