Fix bug caused by sign extension when reading single-byte row numbers; fix some bugs in new text index generation code

git-svn-id: https://svn.code.sf.net/p/jackcess/code/jackcess/trunk@252 f203690c-595d-4dc9-a70b-905162fa7fd2

1 files changed, 4 insertions, 2 deletions

diff --git a/src/java/com/healthmarketscience/jackcess/Index.java b/src/java/com/healthmarketscience/jackcess/Index.java
index 2a46959..eb57194 100644
--- a/src/java/com/healthmarketscience/jackcess/Index.java
+++ b/src/java/com/healthmarketscience/jackcess/Index.java
@@ -948,6 +948,7 @@ public class Index implements Comparable<Index> {
             ++charOffset;
           }
           tmpBout.write(extraCodes._extraCodes);
+          ++charOffset;
         }
       }
 
@@ -988,7 +989,7 @@ public class Index implements Comparable<Index> {
     }
 
     // write end extra text
-    tmpBout.write(END_EXTRA_TEXT);    
+    bout.write(END_EXTRA_TEXT);    
   }
 
   /**
@@ -1295,7 +1296,8 @@ public class Index implements Comparable<Index> {
 
       // read the rowId
       int page = ByteUtil.get3ByteInt(buffer, ByteOrder.BIG_ENDIAN);
-      int row = buffer.get();
+      int row = ByteUtil.toUnsignedInt(buffer.get());
+      
       _rowId = new RowId(page, row);
       _type = EntryType.NORMAL;
     }