summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Ahlborn <jtahlborn@yahoo.com>2012-05-25 01:44:55 +0000
committerJames Ahlborn <jtahlborn@yahoo.com>2012-05-25 01:44:55 +0000
commit782e6175383597e0dc297c798bbccad582e2fd20 (patch)
treed033af6b3932f3ce493aab6bb797bf831840ebc5
parent2012b9931dec2e5fd9afc8804fe016667fc58285 (diff)
downloadjackcess-782e6175383597e0dc297c798bbccad582e2fd20.tar.gz
jackcess-782e6175383597e0dc297c798bbccad582e2fd20.zip
Fix NPE when running unit tests with db format MSISAM (fixes issue 3529534)
git-svn-id: https://svn.code.sf.net/p/jackcess/code/jackcess/trunk@626 f203690c-595d-4dc9-a70b-905162fa7fd2
-rw-r--r--src/changes/changes.xml3
-rw-r--r--test/src/java/com/healthmarketscience/jackcess/PropertiesTest.java3
2 files changed, 6 insertions, 0 deletions
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 8f2d1d4..9e81c4a 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -8,6 +8,9 @@
<action dev="jahlborn" type="update" issue="3523179">
Add osgi header information to the manifest.
</action>
+ <action dev="jahlborn" type="fix" issue="3529534">
+ Fix NPE when running unit tests with db format MSISAM.
+ </action>
</release>
<release version="1.2.7" date="2012-04-02">
<action dev="jahlborn" type="update" issue="3479560">
diff --git a/test/src/java/com/healthmarketscience/jackcess/PropertiesTest.java b/test/src/java/com/healthmarketscience/jackcess/PropertiesTest.java
index 34d10d6..fccbc67 100644
--- a/test/src/java/com/healthmarketscience/jackcess/PropertiesTest.java
+++ b/test/src/java/com/healthmarketscience/jackcess/PropertiesTest.java
@@ -170,6 +170,9 @@ public class PropertiesTest extends TestCase
{
for(FileFormat ff : SUPPORTED_FILEFORMATS_FOR_READ) {
File[] dbFiles = new File(DIR_TEST_DATA, ff.name()).listFiles();
+ if(dbFiles == null) {
+ continue;
+ }
for(File f : dbFiles) {
if(!f.isFile()) {