Permalink
Browse files

Merge pull request #3 from i0rek/jruby-head

Fix problems for jruby-head.
  • Loading branch information...
2 parents 5447701 + 8a54bf9 commit fca15c9b4f80046a5de9f3201b7a57e2c431936a @bernerdschaefer bernerdschaefer committed Feb 29, 2012
Showing with 2 additions and 3 deletions.
  1. +1 −1 lib/moped/server.rb
  2. +1 −2 lib/moped/socket.rb
View
@@ -1,6 +1,6 @@
module Moped
- unless defined? Addrinfo
+ unless (defined? Addrinfo) && (Addrinfo.respond_to?(:getaddrinfo))
# @private
class Addrinfo
class << self
View
@@ -44,9 +44,8 @@ def connect
begin
socket.connect_nonblock sockaddr
rescue IO::WaitWritable, Errno::EINPROGRESS
- IO.select nil, [socket], nil, 0.5
-
begin
+ IO.select nil, [socket], nil, 0.5
socket.connect_nonblock sockaddr
rescue Errno::EISCONN # we're connected
rescue

0 comments on commit fca15c9

Please sign in to comment.