Merge pull request #2451 from Who828/sync_thread_group_fix

No need to synchronise a newly created local RubyArray
jruby · Jan 12, 2015 · d99bfd9 · d99bfd9
1 parent 01f3945
commit d99bfd9
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/core/src/main/java/org/jruby/RubyThreadGroup.java b/core/src/main/java/org/jruby/RubyThreadGroup.java
@@ -145,14 +145,14 @@ public IRubyObject enclosed_p(Block block) {
     @JRubyMethod
     public IRubyObject list(Block block) {
         RubyArray ary = RubyArray.newArray(getRuntime());
-            synchronized (ary) {
+        synchronized (rubyThreadList) {
             for (RubyThread thread : rubyThreadList) {
                 if (thread != null) {
                     ary.append(thread);
                 }
             }
-            return ary;
         }
+        return ary;
     }
 
     private RubyThreadGroup(Ruby runtime, RubyClass type) {