You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@metamodel.apache.org by ka...@apache.org on 2013/12/06 20:38:15 UTC
git commit: METAMODEL-32: Fixed thread safety of
XlsxSpreadsheetReaderDelegate
Updated Branches:
refs/heads/master 30cc23688 -> c26a7970d
METAMODEL-32: Fixed thread safety of XlsxSpreadsheetReaderDelegate
Project: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/commit/c26a7970
Tree: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/tree/c26a7970
Diff: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/diff/c26a7970
Branch: refs/heads/master
Commit: c26a7970d59d24c5b6a091e8689bfa801fc7919c
Parents: 30cc236
Author: Kasper Sørensen <i....@gmail.com>
Authored: Fri Dec 6 20:38:09 2013 +0100
Committer: Kasper Sørensen <i....@gmail.com>
Committed: Fri Dec 6 20:38:09 2013 +0100
----------------------------------------------------------------------
.../metamodel/excel/XlsxSpreadsheetReaderDelegate.java | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/c26a7970/excel/src/main/java/org/apache/metamodel/excel/XlsxSpreadsheetReaderDelegate.java
----------------------------------------------------------------------
diff --git a/excel/src/main/java/org/apache/metamodel/excel/XlsxSpreadsheetReaderDelegate.java b/excel/src/main/java/org/apache/metamodel/excel/XlsxSpreadsheetReaderDelegate.java
index 8f36847..d2e0e98 100644
--- a/excel/src/main/java/org/apache/metamodel/excel/XlsxSpreadsheetReaderDelegate.java
+++ b/excel/src/main/java/org/apache/metamodel/excel/XlsxSpreadsheetReaderDelegate.java
@@ -20,13 +20,11 @@ package org.apache.metamodel.excel;
import java.io.InputStream;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
+import java.util.concurrent.ConcurrentHashMap;
-import org.apache.poi.openxml4j.opc.OPCPackage;
-import org.apache.poi.xssf.eventusermodel.XSSFReader;
import org.apache.metamodel.data.DataSet;
import org.apache.metamodel.data.RowPublisherDataSet;
import org.apache.metamodel.data.Style;
@@ -41,6 +39,8 @@ import org.apache.metamodel.schema.Table;
import org.apache.metamodel.util.AlphabeticSequence;
import org.apache.metamodel.util.FileHelper;
import org.apache.metamodel.util.Ref;
+import org.apache.poi.openxml4j.opc.OPCPackage;
+import org.apache.poi.xssf.eventusermodel.XSSFReader;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.xml.sax.InputSource;
@@ -62,7 +62,7 @@ final class XlsxSpreadsheetReaderDelegate implements SpreadsheetReaderDelegate {
public XlsxSpreadsheetReaderDelegate(ExcelConfiguration configuration) {
_configuration = configuration;
- _tableNamesToInternalIds = new HashMap<String, String>();
+ _tableNamesToInternalIds = new ConcurrentHashMap<String, String>();
}
@Override
@@ -70,6 +70,10 @@ final class XlsxSpreadsheetReaderDelegate implements SpreadsheetReaderDelegate {
final OPCPackage pkg = OPCPackage.open(inputStream);
final XSSFReader xssfReader = new XSSFReader(pkg);
final String relationshipId = _tableNamesToInternalIds.get(table.getName());
+
+ if (relationshipId == null) {
+ throw new IllegalStateException("No internal relationshipId found for table: " + table);
+ }
return buildDataSet(columns, maxRows, relationshipId, xssfReader);
}