summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Klishin <mklishin@pivotal.io>2016-04-29 23:40:51 -0500
committerMichael Klishin <mklishin@pivotal.io>2016-04-29 23:40:51 -0500
commit773f356d4648e86bb1ed8c945359141d7db0d4d2 (patch)
tree936b248208cd147a97a708a9d16aaf50438965b7
parentd93efbbe2eb932f6314a1c9b08fae5b60c8f812b (diff)
parent0a3e7877d81e679f3294a30c6854cad63e52c522 (diff)
downloadrabbitmq-server-git-773f356d4648e86bb1ed8c945359141d7db0d4d2.tar.gz
Merge branch 'stable'
-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.