From: James Ahlborn <jtahlborn@yahoo.com>
Date: Mon, 31 Dec 2018 21:17:29 +0000 (+0000)
Subject: merge trunk changes through r1258
X-Git-Tag: jackcess-3.0.0~7^2~10
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=86ae9b01032bee4c2a47bb5428e9777efbc22c71;p=jackcess.git

merge trunk changes through r1258

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

86ae9b01032bee4c2a47bb5428e9777efbc22c71
diff --cc src/main/java/com/healthmarketscience/jackcess/impl/ColumnImpl.java
index 4172874,3445ba3..212b912
--- a/src/main/java/com/healthmarketscience/jackcess/impl/ColumnImpl.java
+++ b/src/main/java/com/healthmarketscience/jackcess/impl/ColumnImpl.java
@@@ -468,12 -433,17 +472,19 @@@ public class ColumnImpl implements Colu
      return _columnLength;
    }
  
 +  @Override
-   public short getLengthInUnits() {
-     return (short)getType().toUnitSize(getLength());
+   public final short getLengthInUnits() {
+     if(_lengthInUnits == INVALID_LENGTH) {
+       _lengthInUnits = calcLengthInUnits();
+     }
+     return (short)_lengthInUnits;
+   }
+ 
+   protected int calcLengthInUnits() {
+     return getType().toUnitSize(getLength(), getFormat());
    }
  
 +  @Override
    public boolean isCalculated() {
      return _calculated;
    }