Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0e689aba authored by Jeff Brown's avatar Jeff Brown Committed by Android (Google) Code Review
Browse files

Merge "Don't throw if sqlite3_finalize returns an error."

parents 96ba76fb 958cbbab
Loading
Loading
Loading
Loading
+4 −4
Original line number Diff line number Diff line
@@ -426,11 +426,11 @@ static void nativeFinalizeStatement(JNIEnv* env, jclass clazz, jint connectionPt
    SQLiteConnection* connection = reinterpret_cast<SQLiteConnection*>(connectionPtr);
    sqlite3_stmt* statement = reinterpret_cast<sqlite3_stmt*>(statementPtr);

    // We ignore the result of sqlite3_finalize because it is really telling us about
    // whether any errors occurred while executing the statement.  The statement itself
    // is always finalized regardless.
    ALOGV("Finalized statement %p on connection %p", statement, connection->db);
    int err = sqlite3_finalize(statement);
    if (err != SQLITE_OK) {
        throw_sqlite3_exception(env, connection->db, NULL);
    }
    sqlite3_finalize(statement);
}

static jint nativeGetParameterCount(JNIEnv* env, jclass clazz, jint connectionPtr,