Fixed bug in receive hook for repositories in subfolders

James Moger

2012-01-05 cb285cbfddfc0b633d6b8cdb4dc0d2bd2b8b51ef

 src/com/gitblit/models/FederationModel.java

@@ -73,6 +73,8 @@
    */

   public FederationModel(String serverName) {

      this.name = serverName;

      bare = true;

      mirror = true;

      this.lastPull = new Date(0);

      this.nextPull = new Date(0);

   }

@@ -196,22 +198,7 @@
      @Override

      public int compareTo(RepositoryStatus o) {

         if (status.equals(o.status)) {

            // sort root repositories first, alphabetically

            // then sort grouped repositories, alphabetically

            int s1 = name.indexOf('/');

            int s2 = o.name.indexOf('/');

            if (s1 == -1 && s2 == -1) {

               // neither grouped

               return name.compareTo(o.name);

            } else if (s1 > -1 && s2 > -1) {

               // both grouped

               return name.compareTo(o.name);

            } else if (s1 == -1) {

               return -1;

            } else if (s2 == -1) {

               return 1;

            }

            return 0;

            return StringUtils.compareRepositoryNames(name, o.name);

         }

         return status.compareTo(o.status);

      }