Backport bug 24953 (Erlang client should use fhc when running in the …

…same VM as rabbit)
rabbitmq · Aug 15, 2012 · e206de1 · e206de1
1 parent cb652f5
commit e206de1
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/src/amqp_network_connection.erl b/src/amqp_network_connection.erl
@@ -117,6 +117,7 @@ do_connect({Addr, Family},
                                              connection_timeout = Timeout,
                                              socket_options     = ExtraOpts},
            SIF, ChMgr, State) ->
+    obtain(),
     case gen_tcp:connect(Addr, Port,
                          [Family | ?RABBIT_TCP_OPTS] ++ ExtraOpts,
                          Timeout) of
@@ -131,6 +132,7 @@ do_connect({Addr, Family},
                                              socket_options     = ExtraOpts},
            SIF, ChMgr, State) ->
     rabbit_misc:start_applications([crypto, public_key, ssl]),
+    obtain(),
     case gen_tcp:connect(Addr, Port,
                          [Family | ?RABBIT_TCP_OPTS] ++ ExtraOpts,
                          Timeout) of
@@ -306,3 +308,9 @@ handshake_recv(Expecting) ->
                 exit(handshake_receive_timed_out)
         end
     end.
+
+obtain() ->
+    case code:is_loaded(file_handle_cache) of
+        false -> ok;
+        _     -> file_handle_cache:obtain()
+    end.