From 9dcd3885dd165f04df36f1879da013855131a9ba Mon Sep 17 00:00:00 2001 From: Hiro Asari Date: Mon, 24 Oct 2011 23:19:34 -0400 Subject: [PATCH] Modified fix for Pull Request #85 https://github.com/jruby/jruby/pull/85 --- src/org/jruby/ext/socket/RubySocket.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/org/jruby/ext/socket/RubySocket.java b/src/org/jruby/ext/socket/RubySocket.java index e520ccdcf5f..9486eccff56 100644 --- a/src/org/jruby/ext/socket/RubySocket.java +++ b/src/org/jruby/ext/socket/RubySocket.java @@ -509,8 +509,9 @@ public static IRubyObject pack_sockaddr_in(IRubyObject recv, IRubyObject port, I } @JRubyMethod(name = {"pack_sockaddr_in", "sockaddr_in"}, meta = true) public static IRubyObject pack_sockaddr_in(ThreadContext context, IRubyObject recv, IRubyObject port, IRubyObject host) { + int portNum = port instanceof RubyString ? Integer.parseInt(port.convertToString().toString()): RubyNumeric.fix2int(port); return pack_sockaddr_in(context, recv, - RubyNumeric.fix2int(port), + portNum, host.isNil() ? null : host.convertToString().toString()); } public static IRubyObject pack_sockaddr_in(ThreadContext context, IRubyObject recv, int iport, String host) {