yetangitu/FBReaderJ
1
0
Fork 0
mirror of https://github.com/geometer/FBReaderJ.git synced 2025-10-04 18:29:23 +02:00
Code Issues Releases Wiki Activity

FIXED: Some database cursors weren't closed if the query doesn't return data.

Browse source
This commit is contained in:
Steffen Siebert 2011-01-14 19:55:45 +01:00 • committed by Nikolay Pultsin
parent 071ecf88d5
commit ad6d60ad25
1 changed files with 2 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/org/geometerplus/android/fbreader/SQLiteBooksDatabase.java
View file

@ -344,6 +344,7 @@ public final class SQLiteBooksDatabase extends BooksDatabase {
protected List<Author> loadAuthors(long bookId) { protected List<Author> loadAuthors(long bookId) {
final Cursor cursor = myDatabase.rawQuery("SELECT Authors.name,Authors.sort_key FROM BookAuthor INNER JOIN Authors ON Authors.author_id = BookAuthor.author_id WHERE BookAuthor.book_id = ?", new String[] { "" + bookId }); final Cursor cursor = myDatabase.rawQuery("SELECT Authors.name,Authors.sort_key FROM BookAuthor INNER JOIN Authors ON Authors.author_id = BookAuthor.author_id WHERE BookAuthor.book_id = ?", new String[] { "" + bookId });
if (!cursor.moveToNext()) { if (!cursor.moveToNext()) {
cursor.close();
return null; return null;
} }
final ArrayList<Author> list = new ArrayList<Author>(); final ArrayList<Author> list = new ArrayList<Author>();
@ -435,6 +436,7 @@ public final class SQLiteBooksDatabase extends BooksDatabase {
protected List<Tag> loadTags(long bookId) { protected List<Tag> loadTags(long bookId) {
final Cursor cursor = myDatabase.rawQuery("SELECT Tags.tag_id FROM BookTag INNER JOIN Tags ON Tags.tag_id = BookTag.tag_id WHERE BookTag.book_id = ?", new String[] { "" + bookId }); final Cursor cursor = myDatabase.rawQuery("SELECT Tags.tag_id FROM BookTag INNER JOIN Tags ON Tags.tag_id = BookTag.tag_id WHERE BookTag.book_id = ?", new String[] { "" + bookId });
if (!cursor.moveToNext()) { if (!cursor.moveToNext()) {
cursor.close();
return null; return null;
} }
ArrayList<Tag> list = new ArrayList<Tag>(); ArrayList<Tag> list = new ArrayList<Tag>();