Merge pull request #2451 from Who828/sync_thread_group_fix

headius · headius · commit d99bfd9c3e0c · 2015-01-12T11:17:29.000-06:00
No need to synchronise a newly created local RubyArray
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) {

Original file line number	Diff line number	Diff line change
`@@ -145,14 +145,14 @@ public IRubyObject enclosed_p(Block block) {`
`145`	`145`	`@JRubyMethod`
`146`	`146`	`public IRubyObject list(Block block) {`
`147`	`147`	`RubyArray ary = RubyArray.newArray(getRuntime());`
`148`		`- synchronized (ary) {`
	`148`	`+ synchronized (rubyThreadList) {`
`149`	`149`	`for (RubyThread thread : rubyThreadList) {`
`150`	`150`	`if (thread != null) {`
`151`	`151`	`ary.append(thread);`
`152`	`152`	`}`
`153`	`153`	`}`
`154`		`- return ary;`
`155`	`154`	`}`
	`155`	`+ return ary;`
`156`	`156`	`}`
`157`	`157`
`158`	`158`	`private RubyThreadGroup(Ruby runtime, RubyClass type) {`