diff --git a/CHANGES b/CHANGES index a2044fa0b5..335d1919dc 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,10 @@ +2.3-697 | 2015-04-15 09:51:15 -0700 + + * Removing error check verifyingn that an ASCII writer has been + properly finished. Instead of aborting, we now just clean up in + that case and proceed. Addresses BIT-1331. (Robin Sommer) + 2.3-696 | 2015-04-14 15:56:36 -0700 * Update sqlite to 3.8.9 diff --git a/VERSION b/VERSION index 5b0c074744..126682d76e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.3-696 +2.3-697 diff --git a/src/logging/writers/ascii/Ascii.cc b/src/logging/writers/ascii/Ascii.cc index a27553916f..d6f5daa7e7 100644 --- a/src/logging/writers/ascii/Ascii.cc +++ b/src/logging/writers/ascii/Ascii.cc @@ -181,10 +181,9 @@ bool Ascii::InitFormatter() Ascii::~Ascii() { if ( ! ascii_done ) - { - fprintf(stderr, "internal error: finish missing\n"); - abort(); - } + // In case of errors aborting the logging altogether, + // DoFinish() may not have been called. + CloseFile(network_time); delete formatter; }