jruby · Aug 6, 2015 · Aug 6, 2015 · Aug 6, 2015
Showing with 33 additions and 0 deletions.

+2 −0 core/src/main/java/org/jruby/ext/socket/RubyTCPServer.java

+26 −0 spec/ruby/core/array/uniq_spec.rb

+5 −0 spec/ruby/library/socket/tcpserver/new_spec.rb
diff --git a/core/src/main/java/org/jruby/ext/socket/RubyTCPServer.java b/core/src/main/java/org/jruby/ext/socket/RubyTCPServer.java
@@ -101,6 +101,8 @@ public IRubyObject initialize(ThreadContext context, IRubyObject[] args) {
             InetAddress addr = InetAddress.getByName(host);
 
             ServerSocketChannel ssc = ServerSocketChannel.open();
+            ssc.socket().setReuseAddress(true);
+
             InetSocketAddress socket_address = new InetSocketAddress(addr, port);
 
             ssc.socket().bind(socket_address);

diff --git a/spec/ruby/core/array/uniq_spec.rb b/spec/ruby/core/array/uniq_spec.rb
@@ -107,6 +107,32 @@ def obj.eql?(o)
 
     [x, x].uniq.should == [x]
   end
+
+  describe "given an array of BasicObject subclasses that define ==, eql?, and hash" do
+    # jruby/jruby#3227
+    it "filters equivalent elements using those definitions" do
+
+      basic = Class.new(BasicObject) do
+        attr_reader :x
+
+        def initialize(x)
+          @x = x
+        end
+
+        def ==(rhs)
+          @x == rhs.x
+        end
+        alias_method :eql?, :==
+
+        def hash
+          @x.hash
+        end
+      end
+
+      a = [basic.new(3), basic.new(2), basic.new(1), basic.new(4), basic.new(1), basic.new(2), basic.new(3)]
+      a.uniq.should == [basic.new(3), basic.new(2), basic.new(1), basic.new(4)]
+    end
+  end
 end
 
 describe "Array#uniq!" do

diff --git a/spec/ruby/library/socket/tcpserver/new_spec.rb b/spec/ruby/library/socket/tcpserver/new_spec.rb
@@ -84,4 +84,9 @@ def t.to_str; SocketSpecs.port.to_s; end
       @server = TCPServer.new('127.0.0.1', SocketSpecs.port)
     }.should raise_error(Errno::EADDRINUSE)
   end
+
+  it "sets SO_REUSEADDR on the resulting server" do
+    @server = TCPServer.new('127.0.0.1', SocketSpecs.port)
+    @server.getsockopt(:SOCKET, :REUSEADDR).should == 1
+  end
 end