Merge branch '4.0.3'

Author: andreasohlund

src/NServiceBus.Core/Unicast/Transport/FirstLevelRetries.cs

@@ -28,10 +28,8 @@ public bool HasMaxRetriesForMessageBeenReached(TransportMessage message)
                     return false;
                 }
 
-                if (TryInvokeFaultManager(message, e.Item2))
-                {
-                    ClearFailuresForMessage(message);
-                }
+                TryInvokeFaultManager(message, e.Item2);
+                ClearFailuresForMessage(message);
 
                 return true;
             }
@@ -52,7 +50,7 @@ public void IncrementFailuresForMessage(TransportMessage message, Exception e)
                                            (s, i) => new Tuple<int, Exception>(i.Item1 + 1, e));
         }
 
-        private bool TryInvokeFaultManager(TransportMessage message, Exception exception)
+        private void TryInvokeFaultManager(TransportMessage message, Exception exception)
         {
             try
             {
@@ -71,16 +69,13 @@ private bool TryInvokeFaultManager(TransportMessage message, Exception exception
                 message.RevertToOriginalBodyIfNeeded();
 
                 failureManager.ProcessingAlwaysFailsForMessage(message, e);
-
-                return true;
             }
             catch (Exception ex)
             {
-                Configure.Instance.RaiseCriticalError(
-                    String.Format("Fault manager failed to process the failed message with id {0}", message.Id), ex);
-            }
+                Configure.Instance.RaiseCriticalError(String.Format("Fault manager failed to process the failed message with id {0}", message.Id), ex);
 
-            return false;
+                throw;
+            }
         }
     }
 }