Added Scope unit tests and switch internal children to new concurrent collection base

Author: mondain

src/main/java/org/red5/server/api/scope/IScope.java

@@ -111,6 +111,14 @@ public interface IScope extends IBasicScope, ResourcePatternResolver, IServiceHa
      */
     public IBroadcastScope getBroadcastScope(String name);
 
+    /**
+     * Get a child scope by name.
+     * 
+     * @param name Name of the child scope
+     * @return the child scope, or null if no scope is found
+     */
+    public IBasicScope getBasicScope(String name);
+
     /**
      * Get a child scope by type and name.
      * 

src/main/java/org/red5/server/scope/BasicScope.java

@@ -188,7 +188,7 @@ public int getDepth() {
      */
     @Override
     public String getPath() {
-        return parent.getPath() + '/' + parent.getName();
+        return String.format("%s/%s", parent.getPath(), parent.getName());
     }
 
     /**
@@ -402,18 +402,28 @@ public boolean equals(Object obj) {
     }
 
     public int compareTo(BasicScope that) {
-        if (this.equals(that)) {
+        if (equals(that)) {
             return 0;
         }
-        return name.compareTo(that.getName());
+        // check name first
+        int c = name.compareTo(that.getName());
+        if (c == 0) {
+            // check type if names were equal
+            c = type.compareTo(that.getType());
+            if (c == 0) {
+                // check path if we've gotten this far
+                c = getPath().compareTo(that.getPath());
+            }
+        }
+        return c;
     }
 
     /**
      * Keeps the scope alive for a set number of seconds.
      */
     private class KeepAliveJob implements IScheduledJob {
 
-        private IBasicScope scope = null;
+        private final IBasicScope scope;
 
         KeepAliveJob(IBasicScope scope) {
             this.scope = scope;