Pass on original exceptions

and rename test method to something more appropriate
neo4j · Nov 8, 2016 · 675a4eb · 675a4eb
1 parent 7f2985e
commit 675a4eb
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/...ity/kernel/src/main/java/org/neo4j/kernel/impl/store/UnexpectedStoreVersionException.java b/...ity/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
@@ -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
@@ -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
@@ -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 );