OSDN Git Service

稀にenexファイルのインポートに失敗することがある問題を修正。
authoryuki <kimaira7@gmail.com>
Mon, 20 Oct 2014 07:35:57 +0000 (16:35 +0900)
committeryuki <kimaira7@gmail.com>
Mon, 20 Oct 2014 07:35:57 +0000 (16:35 +0900)
src/cx/fbn/nevernote/sql/NoteResourceTable.java

index d5507aa..42fd574 100644 (file)
@@ -167,6 +167,10 @@ public class NoteResourceTable  {
                NSqlQuery query = new NSqlQuery(db.getResourceConnection());\r
                SimpleDateFormat simple = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");\r
                \r
+               if (r.getData().getBodyHash() == null || r.getData().getBody() == null) {\r
+                       return;\r
+               }\r
+               \r
                query.prepare("Insert Into NoteResources ("\r
                                +"guid, noteGuid, dataHash, dataSize, dataBinary, updateSequenceNumber, "\r
                                +"mime, width, height, duration, active, recognitionHash, "                             \r
@@ -187,7 +191,6 @@ public class NoteResourceTable  {
                        query.bindValue(":noteGuid", r.getNoteGuid());\r
                        if (r.getData() != null) {\r
                                query.bindValue(":dataHash", byteArrayToHexString(r.getData().getBodyHash()));\r
-//                             query.bindValue(":dataHash", "c0369123fe9871d675ae456fd056ba33");\r
                                query.bindValue(":dataSize", r.getData().getSize());\r
                                query.bindBlob(":dataBody", r.getData().getBody());\r
                        }\r