Merge pull request #397 from appirio-tech/dev

 Updated token properties file location

Author: Gunasekar-K

.circleci/config.yml

@@ -96,7 +96,7 @@ jobs:
       - run:
           name: copying configuration file
           command: |
-            cp ./../buildscript/direct/conf/dev/token.properties.enc .
+            cp ./../buildscript/direct/conf/qa/token.properties.enc .
             openssl enc -aes-256-cbc -d -in token.properties.enc -out token.properties -k $SECPASSWD
       - run:
           name: Installation of build dependencies.
@@ -158,7 +158,7 @@ jobs:
       - run:
           name: copying configuration file
           command: |
-            cp ./../buildscript/direct/conf/dev/token.properties.enc .
+            cp ./../buildscript/direct/conf/prod/token.properties.enc .
             openssl enc -aes-256-cbc -d -in token.properties.enc -out token.properties -k $SECPASSWD
       - run:
           name: Installation of build dependencies.

src/java/main/com/topcoder/direct/services/view/action/contest/launch/GetGroupMemberAction.java

@@ -140,34 +140,34 @@ private List<? extends Map<String,String>> getData() throws Exception {
      */
     private Set<Long> getGroupMembers() throws Exception{
         Set<Long> members = new HashSet<Long>();
+        // this will be increased, for inner groups
         LinkedList<Long> gids = new LinkedList<Long>(groupIds);
         Set<Long> gidProcessed = new HashSet<Long>();
         boolean finished = false;
-
         while (!finished) {
             ListIterator<Long> iter = gids.listIterator();
+            finished = true;
             while (iter.hasNext()) {
                 Long gid = iter.next();
                 if (!gidProcessed.contains(gid)) {
                     logger.info("processing gid: " + gid);
                     RestResult<GroupMember> result = getGroupMemberByGid(gid);
-                    if (result == null) {
-                        continue;
-                    }
-                    for (GroupMember gm : result.getContent()) {
-                        if (gm.isGroup()) {
-                            if (!gids.contains(gm.getMemberId())) {
-                                iter.add(gm.getMemberId());
+                    if (result != null) {
+                        for (GroupMember gm : result.getContent()) {
+                            if (gm.isGroup()) {
+                                if (!gids.contains(gm.getMemberId())) {
+                                    iter.add(gm.getMemberId());
+                                    finished = false;
+                                }
+                                logger.info(" inner group: " + gm.getMemberId());
+                            } else {
+                                members.add(gm.getMemberId());
                             }
-                            logger.info(" inner group: " + gm.getMemberId());
-                        } else {
-                            members.add(gm.getMemberId());
                         }
                     }
                     gidProcessed.add(gid);
                 }
             }
-            if (gids.size() == gidProcessed.size()) finished = true;
         }
         return members;
     }