summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMichael Klishin <mklishin@pivotal.io>2016-04-29 23:40:36 -0500
committerMichael Klishin <mklishin@pivotal.io>2016-04-29 23:40:36 -0500
commit0a3e7877d81e679f3294a30c6854cad63e52c522 (patch)
tree21e6f4a1d3fa523de0d31947d1604e1c82866bc1 /src
parent392e0396c844493c977223225c95aca277d5b8b1 (diff)
parent6f11f14d183050b8804c0adf304bf7468586296e (diff)
downloadrabbitmq-server-git-0a3e7877d81e679f3294a30c6854cad63e52c522.tar.gz
Merge branch 'rabbitmq-server-749' into stable
Diffstat (limited to 'src')
-rw-r--r--src/gm.erl6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/gm.erl b/src/gm.erl
index 199cf7c4de..1e4168c0e6 100644
--- a/src/gm.erl
+++ b/src/gm.erl
@@ -1338,7 +1338,11 @@ find_common(A, B, Common) ->
{{{value, Val}, A1}, {{value, Val}, B1}} ->
find_common(A1, B1, queue:in(Val, Common));
{{empty, _A}, _} ->
- {Common, B}
+ {Common, B};
+ {_, {_, B1}} ->
+ find_common(A, B1, Common);
+ {{_, A1}, _} ->
+ find_common(A1, B, Common)
end.