CORDA-2317: Improved error message if counterparty forgets to call Re…

…ceiveFinalityFlow (corda#4407)
mejuhi · Dec 12, 2018 · 5bc2575 · 5bc2575
1 parent ed3bc27
commit 5bc2575
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/core/src/main/kotlin/net/corda/core/flows/FinalityFlow.kt b/core/src/main/kotlin/net/corda/core/flows/FinalityFlow.kt
@@ -128,8 +128,17 @@ class FinalityFlow private constructor(val transaction: SignedTransaction,
             }
         } else {
             for (session in sessions) {
-                subFlow(SendTransactionFlow(session, notarised))
-                logger.info("Party ${session.counterparty} received the transaction.")
+                try {
+                    subFlow(SendTransactionFlow(session, notarised))
+                    logger.info("Party ${session.counterparty} received the transaction.")
+                } catch (e: UnexpectedFlowEndException) {
+                    throw UnexpectedFlowEndException(
+                            "${session.counterparty} has finished prematurely and we're trying to send them the finalised transaction. " +
+                                    "Did they forget to call ReceiveFinalityFlow? (${e.message})",
+                            e.cause,
+                            e.originalErrorId
+                    )
+                }
             }
         }