From 675a4eb6148be5e369140e7a6a5fd0e7cf269f2b Mon Sep 17 00:00:00 2001
From: Jonas Kalderstam <jonas@kalderstam.se>
Date: Tue, 8 Nov 2016 14:05:25 +0100
Subject: [PATCH] Pass on original exceptions

and rename test method to something more appropriate
---
 .../kernel/impl/store/UnexpectedStoreVersionException.java  | 6 +++---
 .../src/main/java/org/neo4j/backup/BackupService.java       | 2 +-
 .../backup/src/main/java/org/neo4j/backup/BackupTool.java   | 2 +-
 .../backup/src/test/java/org/neo4j/backup/BackupToolIT.java | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/UnexpectedStoreVersionException.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/UnexpectedStoreVersionException.java
index d66b70fe8fa12..2526fc77654cf 100644
--- a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/UnexpectedStoreVersionException.java
+++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/UnexpectedStoreVersionException.java
@@ -25,11 +25,11 @@ public class UnexpectedStoreVersionException extends StoreFailureException
 
     public UnexpectedStoreVersionException( String actualStoreVersion, String expectedStoreVersion )
     {
-        this( String.format( MESSAGE, actualStoreVersion, expectedStoreVersion ) );
+        super( String.format( MESSAGE, actualStoreVersion, expectedStoreVersion ) );
     }
 
-    public UnexpectedStoreVersionException( String msg )
+    public UnexpectedStoreVersionException( String msg, Throwable originalError )
     {
-        super( msg );
+        super( msg, originalError );
     }
 }
diff --git a/enterprise/backup/src/main/java/org/neo4j/backup/BackupService.java b/enterprise/backup/src/main/java/org/neo4j/backup/BackupService.java
index 07a3b34832c43..5f195330d65ea 100644
--- a/enterprise/backup/src/main/java/org/neo4j/backup/BackupService.java
+++ b/enterprise/backup/src/main/java/org/neo4j/backup/BackupService.java
@@ -267,7 +267,7 @@ BackupOutcome doIncrementalBackupOrFallbackToFull( String sourceHostNameOrIp, in
             if ( cause instanceof UpgradeNotAllowedByConfigurationException )
             {
                 throw new UnexpectedStoreVersionException( "Failed to perform backup because existing backup is from " +
-                        "a different version." );
+                        "a different version.", e );
             }
 
             throw e;
diff --git a/enterprise/backup/src/main/java/org/neo4j/backup/BackupTool.java b/enterprise/backup/src/main/java/org/neo4j/backup/BackupTool.java
index 2ebe4ede4fbae..4db9e9f45ba14 100644
--- a/enterprise/backup/src/main/java/org/neo4j/backup/BackupTool.java
+++ b/enterprise/backup/src/main/java/org/neo4j/backup/BackupTool.java
@@ -205,7 +205,7 @@ BackupOutcome executeBackup( HostnamePort hostnamePort, File to, ConsistencyChec
         }
         catch ( UnexpectedStoreVersionException e )
         {
-            throw new ToolFailureException( e.getMessage() );
+            throw new ToolFailureException( e.getMessage(), e );
         }
         catch ( MismatchingStoreIdException e )
         {
diff --git a/enterprise/backup/src/test/java/org/neo4j/backup/BackupToolIT.java b/enterprise/backup/src/test/java/org/neo4j/backup/BackupToolIT.java
index 55635227a1b20..03b37b09313e0 100644
--- a/enterprise/backup/src/test/java/org/neo4j/backup/BackupToolIT.java
+++ b/enterprise/backup/src/test/java/org/neo4j/backup/BackupToolIT.java
@@ -74,7 +74,7 @@ public void teardown() throws Exception
     }
 
     @Test
-    public void oldIncompatibleBackupsAreMovedToSubDir() throws Exception
+    public void oldIncompatibleBackupsThrows() throws Exception
     {
         // Prepare an "old" backup
         prepareNeoStoreFile( StandardV2_3.STORE_VERSION );