From 6305bdc69fec99a60d58592e795ecffecf88e44e Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Sun, 22 Dec 2013 23:03:14 +0100 Subject: [PATCH] [Minor] caught an NPE when the Transaction fails but no cause is set --- .../eitchnet/xmlpers/impl/DefaultPersistenceTransaction.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/ch/eitchnet/xmlpers/impl/DefaultPersistenceTransaction.java b/src/main/java/ch/eitchnet/xmlpers/impl/DefaultPersistenceTransaction.java index 90e5fdd6a..650df2614 100644 --- a/src/main/java/ch/eitchnet/xmlpers/impl/DefaultPersistenceTransaction.java +++ b/src/main/java/ch/eitchnet/xmlpers/impl/DefaultPersistenceTransaction.java @@ -283,7 +283,9 @@ public class DefaultPersistenceTransaction implements PersistenceTransaction { if (this.txResult.getState() == TransactionState.FAILED) { String msg = "Failed to commit TX due to underlying exception: {0}"; //$NON-NLS-1$ - msg = MessageFormat.format(msg, this.txResult.getFailCause().getMessage()); + String causeMsg = this.txResult.getFailCause() == null ? null : this.txResult.getFailCause() + .getMessage(); + msg = MessageFormat.format(msg, causeMsg); throw new XmlPersistenceException(msg, this.txResult.getFailCause()); } }