lib/bunny/session.rb in bunny-0.9.0.rc1 vs lib/bunny/session.rb in bunny-0.9.0.rc2

@@ -176,15 +176,11 @@
     end
 
     def configure_socket(&block)
       raise ArgumentError, "No block provided!" if block.nil?
 
-      if @transport
-        @transport.configure_socket(&block)
-      else
-        @socket_configurator = block
-      end
+      @transport.configure_socket(&block)
     end
 
     # Starts the connection process.
     #
     # @see http://rubybunny.info/articles/getting_started.html
@@ -197,13 +193,12 @@
       self.reset_continuations
 
       begin
         # close existing transport if we have one,
         # to not leak sockets
-        self.maybe_close_transport
-        self.initialize_transport
+        @transport.maybe_initialize_socket
 
-        @transport.initialize_socket
+        @transport.post_initialize_socket
         @transport.connect
 
         if @socket_configurator
           @transport.configure_socket(&@socket_configurator)
         end