From 7da179b14d63e4f3d33d1dcd12e540bc79e142a8 Mon Sep 17 00:00:00 2001
From: Sonia Zorba <zorba@oats.inaf.it>
Date: Thu, 1 Feb 2018 15:13:02 +0100
Subject: [PATCH] NPE bugfix
---
.../java/it/inaf/ia2/tsm/datalayer/DBBrokerTemplate.java | 9 ++++++---
TASMAN-webapp/src/main/webapp/consistencyChecks.xhtml | 8 ++++----
2 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/TASMAN-core/src/main/java/it/inaf/ia2/tsm/datalayer/DBBrokerTemplate.java b/TASMAN-core/src/main/java/it/inaf/ia2/tsm/datalayer/DBBrokerTemplate.java
index f32c6b1..e4e4634 100644
--- a/TASMAN-core/src/main/java/it/inaf/ia2/tsm/datalayer/DBBrokerTemplate.java
+++ b/TASMAN-core/src/main/java/it/inaf/ia2/tsm/datalayer/DBBrokerTemplate.java
@@ -841,9 +841,12 @@ public abstract class DBBrokerTemplate implements DBBroker {
columnMetadata.put(Column.ORIGINAL_DATATYPE_KEY, originalDataType);
// Override data type using model definition
- String adqlType = tableModel.get(columnName).getType();
- String definedDataType = TypesMapping.getDataType(adqlType, dataTypeMode);
- columnMetadata.put(Column.DATATYPE_KEY, definedDataType);
+ ColumnModel columnModel = tableModel.get(columnName);
+ if (columnModel != null) {
+ String adqlType = columnModel.getType();
+ String definedDataType = TypesMapping.getDataType(adqlType, dataTypeMode);
+ columnMetadata.put(Column.DATATYPE_KEY, definedDataType);
+ }
}
}
diff --git a/TASMAN-webapp/src/main/webapp/consistencyChecks.xhtml b/TASMAN-webapp/src/main/webapp/consistencyChecks.xhtml
index 9b7ee7d..7d3403d 100644
--- a/TASMAN-webapp/src/main/webapp/consistencyChecks.xhtml
+++ b/TASMAN-webapp/src/main/webapp/consistencyChecks.xhtml
@@ -55,19 +55,19 @@
</ul>
</h:panelGroup>
- <h:panelGroup rendered="#{consistency.tapSchema.consistencyChecks.unexisingTables.size() gt 0}">
+ <h:panelGroup rendered="#{consistency.tapSchema.consistencyChecks.unexistingTables.size() gt 0}">
<h2>Inexistent tables</h2>
<ul>
- <ui:repeat value="#{consistency.tapSchema.consistencyChecks.unexisingTables}" var="table">
+ <ui:repeat value="#{consistency.tapSchema.consistencyChecks.unexistingTables}" var="table">
<li>${table}</li>
</ui:repeat>
</ul>
</h:panelGroup>
- <h:panelGroup rendered="#{consistency.tapSchema.consistencyChecks.unexisingColumns.size() gt 0}">
+ <h:panelGroup rendered="#{consistency.tapSchema.consistencyChecks.unexistingColumns.size() gt 0}">
<h2>Inexistent columns</h2>
<ul>
- <ui:repeat value="#{consistency.tapSchema.consistencyChecks.unexisingColumns.toArray()}" var="column">
+ <ui:repeat value="#{consistency.tapSchema.consistencyChecks.unexistingColumns.toArray()}" var="column">
<li>${column}</li>
</ui:repeat>
</ul>
--
GitLab