Keep bookmark when switching database

Author: henriknyman

cypher-shell/src/main/java/org/neo4j/shell/state/BoltStateHandler.java

@@ -55,26 +55,20 @@ public void setActiveDatabase(String databaseName) throws CommandException
         }
         String previousDatabaseName = activeDatabaseNameAsSetByUser;
         activeDatabaseNameAsSetByUser = databaseName;
-        try
-        {
-            if ( isConnected() )
-            {
-                reconnect( false );
+        try {
+            if (isConnected()) {
+                reconnect(true);
             }
         }
-        catch ( ClientException e )
-        {
-            if ( isInteractive )
-            {
+        catch (ClientException e) {
+            if (isInteractive) {
                 // We want to try to connect to the previous database
                 activeDatabaseNameAsSetByUser = previousDatabaseName;
-                try
-                {
-                    reconnect( false );
+                try {
+                    reconnect(true);
                 }
-                catch ( ClientException e2 )
-                {
-                    e.addSuppressed( e2 );
+                catch (ClientException e2) {
+                    e.addSuppressed(e2);
                 }
             }
             throw e;
@@ -182,7 +176,7 @@ private void reconnect(boolean keepBookmark) {
             builder.withBookmarks(systemBookmark);
         }
 
-        session = driver.session( builder.build() );
+        session = driver.session(builder.build());
 
         String query = activeDatabaseNameAsSetByUser.compareToIgnoreCase(SYSTEM_DB_NAME) == 0 ? "SHOW DEFAULT DATABASE" : "RETURN 1";