]> source.dussan.org Git - jackcess.git/commitdiff
projects / jackcess.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ceba1cd)
merge trunk changes through r729
authorJames Ahlborn <jtahlborn@yahoo.com>
Wed, 29 May 2013 22:15:10 +0000 (22:15 +0000)
committerJames Ahlborn <jtahlborn@yahoo.com>
Wed, 29 May 2013 22:15:10 +0000 (22:15 +0000)
git-svn-id: https://svn.code.sf.net/p/jackcess/code/jackcess/branches/jackcess-2@730 f203690c-595d-4dc9-a70b-905162fa7fd2

src/changes/changes.xml patch | blob | history
src/java/com/healthmarketscience/jackcess/impl/PageChannel.java patch | blob | history
test/src/java/com/healthmarketscience/jackcess/util/ExportTest.java patch | blob | history

diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 0564cc51b904aabff937ee1da6b5e17def41dc56..260f2667cb900474e1a425f8dd88ddcde8670820 100644 (file)
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -4,6 +4,12 @@
     <author email="javajedi@users.sf.net">Tim McCune</author>
   </properties>
   <body>
+    <release version="1.2.13" date="TBD">
+      <action dev="jahlborn" type="fix">
+        Fix partial page updates when using CodecHandlers which can only do
+        full page encoding.
+      </action>
+    </release>
     <release version="1.2.12" date="2013-05-09">
       <action dev="jahlborn" type="fix" system="SourceForge2" issue="94">
         Do not unicode compress strings which are longer than 1024 chars.
diff --git a/src/java/com/healthmarketscience/jackcess/impl/PageChannel.java b/src/java/com/healthmarketscience/jackcess/impl/PageChannel.java
index ab3944758c5a7bd1719bd55b0f64dbe68a1eb02e..79dff31d5cf88d27871a4624ec2127870406d76d 100644 (file)
--- a/src/java/com/healthmarketscience/jackcess/impl/PageChannel.java
+++ b/src/java/com/healthmarketscience/jackcess/impl/PageChannel.java
@@ -236,6 +236,7 @@ public class PageChannel implements Channel, Flushable {
           // reset so we can write the whole page
           page = fullPage;
           pageOffset = 0;
+          writeLen = getFormat().PAGE_SIZE;
 
         } else {
 
diff --git a/test/src/java/com/healthmarketscience/jackcess/util/ExportTest.java b/test/src/java/com/healthmarketscience/jackcess/util/ExportTest.java
index 7b3bfc603ad58f8b17ed629099a9b71daad0abc5..a271771e6017734580331afef231f6d5ac2b236b 100644 (file)
--- a/test/src/java/com/healthmarketscience/jackcess/util/ExportTest.java
+++ b/test/src/java/com/healthmarketscience/jackcess/util/ExportTest.java
@@ -90,8 +90,7 @@ public class ExportTest extends TestCase
         .exportWriter(new BufferedWriter(out));
 
       String expected = 
-        "some text||some more,13,13.25,\"61 62 63 64  65 66 67 68  69 6A 6B 6C  6D 6E 6F 70  71 72 73 74  75 76 77 78" + NL +
-        "79 7A 61 62  63 64\",true," + testDate + NL +
+        "some text||some more,13,13.25,\"61 62 63 64  65 66 67 68  69 6A 6B 6C  6D 6E 6F 70  71 72 73 74  75 76 77 78\n79 7A 61 62  63 64\",true," + testDate + NL +
         "\"crazy'data\"\"here\",-345,-3.45E-4,61 62 63 64  65 66 67,true," + NL +
         "C:\\temp\\some_file.txt,25,0.0,,false," + NL;
 
@@ -107,8 +106,7 @@ public class ExportTest extends TestCase
 
       expected = 
         "col1||col2||col3||col4||col5||col6" + NL +
-        "'some text||some more'||13||13.25||'61 62 63 64  65 66 67 68  69 6A 6B 6C  6D 6E 6F 70  71 72 73 74  75 76 77 78" + NL +
-        "79 7A 61 62  63 64'||true||" + testDate + NL +
+        "'some text||some more'||13||13.25||'61 62 63 64  65 66 67 68  69 6A 6B 6C  6D 6E 6F 70  71 72 73 74  75 76 77 78\n79 7A 61 62  63 64'||true||" + testDate + NL +
         "'crazy''data\"here'||-345||-3.45E-4||61 62 63 64  65 66 67||true||" + NL +
         "C:\\temp\\some_file.txt||25||0.0||||false||" + NL;
       assertEquals(expected, out.toString());
@@ -131,8 +129,7 @@ public class ExportTest extends TestCase
         .exportWriter(new BufferedWriter(out));
 
       expected = 
-        "some text||some more,13,13.25,\"61 62 63 64  65 66 67 68  69 6A 6B 6C  6D 6E 6F 70  71 72 73 74  75 76 77 78" + NL +
-        "79 7A 61 62  63 64\",true," + testDate + NL +
+        "some text||some more,13,13.25,\"61 62 63 64  65 66 67 68  69 6A 6B 6C  6D 6E 6F 70  71 72 73 74  75 76 77 78\n79 7A 61 62  63 64\",true," + testDate + NL +
         "C:\\temp\\some_file.txt,25,0.0,,false," + NL;
 
       assertEquals(expected, out.toString());
Mirror of the Jackcess project: https://github.com/jahlborn/jackcess