merge v1_5 into default

3 files changed, 23 insertions, 19 deletions

diff --git a/packaging/RPMS/Fedora/rabbitmq-server.spec b/packaging/RPMS/Fedora/rabbitmq-server.spec
index 54c7def509..6bf3b841c2 100644
--- a/packaging/RPMS/Fedora/rabbitmq-server.spec
+++ b/packaging/RPMS/Fedora/rabbitmq-server.spec
@@ -28,13 +28,6 @@ scalable implementation of an AMQP broker.
 
 %define _maindir %{buildroot}%{_rabbit_erllibdir}
 
-%pre
-if [ $1 -gt 1 ]; then
-  #Upgrade - stop and remove previous instance of rabbitmq-server init.d script
-  /sbin/service rabbitmq-server stop
-  /sbin/chkconfig --del rabbitmq-server
-fi
-
 %prep
 %setup -q
 
@@ -73,7 +66,14 @@ echo '%defattr(-,root,root, -)' >> %{_builddir}/filelist.%{name}.rpm
         ! -regex '\.\(%{_rabbit_erllibdir}\|%{_rabbit_libdir}\).*' \
         | sed -e 's/^\.//' >> %{_builddir}/filelist.%{name}.rpm)
 
-%post
+%pre
+
+if [ $1 -gt 1 ]; then
+  #Upgrade - stop and remove previous instance of rabbitmq-server init.d script
+  /sbin/service rabbitmq-server stop
+  /sbin/chkconfig --del rabbitmq-server
+fi
+
 # create rabbitmq group
 if ! getent group rabbitmq >/dev/null; then
         groupadd -r rabbitmq
@@ -81,10 +81,11 @@ fi
 
 # create rabbitmq user
 if ! getent passwd rabbitmq >/dev/null; then
-        useradd -r -g rabbitmq -d %{_localstatedir}/lib/rabbitmq  rabbitmq \
-            -c "RabbitMQ messaging server" rabbitmq
+        useradd -r -g rabbitmq -d %{_localstatedir}/lib/rabbitmq rabbitmq \
+            -c "RabbitMQ messaging server"
 fi
 
+%post
 /sbin/chkconfig --add %{name}
 
 %preun
diff --git a/packaging/windows/rabbitmq-service.pod b/packaging/windows/rabbitmq-service.pod
index 7c4d3ef210..8a2d2e5b22 100644
--- a/packaging/windows/rabbitmq-service.pod
+++ b/packaging/windows/rabbitmq-service.pod
@@ -92,8 +92,10 @@ Defaults to 5672.
 
 =head2 ERLANG_SERVICE_MANAGER_PATH
 
-Defaults to F<C:\Program Files\erl5.5.5\erts-5.5.5\bin>. This is 
-the installation location of the Erlang service manager.
+Defaults to F<C:\Program Files\erl5.5.5\erts-5.5.5\bin>
+(or F<C:\Program Files (x86)\erl5.5.5\erts-5.5.5\bin> for 64-bit
+environments). This is the installation location of the Erlang service
+manager.
 
 =head2 CLUSTER_CONFIG_FILE
 
diff --git a/src/rabbit_exchange.erl b/src/rabbit_exchange.erl
index 3b6338c7e4..fc89cfca51 100644
--- a/src/rabbit_exchange.erl
+++ b/src/rabbit_exchange.erl
@@ -347,16 +347,13 @@ exchanges_for_queue(QueueName) ->
       sets:from_list(
         mnesia:select(rabbit_reverse_route, [{MatchHead, [], ['$1']}]))).
 
-has_bindings(ExchangeName) ->
-    MatchHead = #route{binding = #binding{exchange_name = ExchangeName,
-                                          _ = '_'}},
+contains(Table, MatchHead) ->
     try
-        continue(mnesia:select(rabbit_route, [{MatchHead, [], ['$_']}],
-                               1, read))
+        continue(mnesia:select(Table, [{MatchHead, [], ['$_']}], 1, read))
     catch exit:{aborted, {badarg, _}} ->
             %% work around OTP-7025, which was fixed in R12B-1, by
             %% falling back on a less efficient method
-            case mnesia:match_object(rabbit_route, MatchHead, read) of
+            case mnesia:match_object(Table, MatchHead, read) of
                 []    -> false;
                 [_|_] -> true
             end
@@ -566,7 +563,11 @@ maybe_auto_delete(Exchange = #exchange{auto_delete = true}) ->
     ok.
 
 conditional_delete(Exchange = #exchange{name = ExchangeName}) ->
-    case has_bindings(ExchangeName) of
+    Match = #route{binding = #binding{exchange_name = ExchangeName, _ = '_'}},
+    %% we need to check for durable routes here too in case a bunch of
+    %% routes to durable queues have been removed temporarily as a
+    %% result of a node failure
+    case contains(rabbit_route, Match) orelse contains(rabbit_durable_route, Match) of
         false  -> unconditional_delete(Exchange);
         true   -> {error, in_use}
     end.