Merge branch 'hotfix-6.2.11' into support-6.2

Particular · Aug 29, 2018 · a41c590 · a41c590
2 parents ca63cc4 + 86650a6
commit a41c590
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/NServiceBus.NHibernate/Deduplication/GatewayDeduplication.cs b/src/NServiceBus.NHibernate/Deduplication/GatewayDeduplication.cs
@@ -37,11 +37,16 @@ public bool DeduplicateMessage(string clientId, DateTime timeReceived)
                     session.Save(gatewayMessage);
                     tx.Commit();
                 }
-                catch (GenericADOException)
+                catch (ConstraintViolationException)
                 {
                     tx.Rollback();
                     return false;
                 }
+                catch (ADOException)
+                {
+                    tx.Rollback();
+                    throw;
+                }
             }
 
             return true;