Handle exceptions correctly in Realm2JSON tool

Author: jedelbo

CHANGELOG.md

@@ -20,6 +20,7 @@
 * Update libuv used in object store tests from v1.35.0 to v1.48.0 ([PR #7508](https://github.com/realm/realm-core/pull/7508)).
 * Made `set_default_logger` nullable in the bindgen spec.yml (PR [#7515](https://github.com/realm/realm-core/pull/7515)).
 * Added `App::default_base_url()` static accessor for SDKs to retrieve the default base URL from Core. ([PR #7534](https://github.com/realm/realm-core/pull/7534))
+* Realm2JSON tool will now correctly upgrade file to current fileformat.
 
 ----------------------------------------------
 

src/realm/exec/realm2json.cpp

@@ -118,17 +118,17 @@ int main(int argc, char const* argv[])
             print(db->start_read());
             return 0;
         }
-        catch (const realm::FileFormatUpgradeRequired&) {
-            options.allow_file_format_upgrade = true;
-            options.is_immutable = false;
-        }
         catch (const realm::IncompatibleHistories&) {
             hist = realm::sync::make_client_replication();
             options.allow_file_format_upgrade = false;
             options.is_immutable = true;
         }
-        catch (...) {
-            break;
+        catch (const realm::FileAccessError& e) {
+            if (e.code() != realm::ErrorCodes::FileFormatUpgradeRequired) {
+                throw;
+            }
+            options.allow_file_format_upgrade = true;
+            options.is_immutable = false;
         }
     }