Commit 7da179b1 authored by Sonia Zorba's avatar Sonia Zorba
Browse files

NPE bugfix

parent b641f672

TASMAN-core/src/main/java/it/inaf/ia2/tsm/datalayer/DBBrokerTemplate.java

+6 −3
Original line number Diff line number Diff line
@@ -841,11 +841,14 @@ 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();

                ColumnModel columnModel = tableModel.get(columnName);

                if (columnModel != null) {

                    String adqlType = columnModel.getType();

                    String definedDataType = TypesMapping.getDataType(adqlType, dataTypeMode);

                    columnMetadata.put(Column.DATATYPE_KEY, definedDataType);

                }

            }

        }



        return metadata;

    }

TASMAN-webapp/src/main/webapp/consistencyChecks.xhtml

+4 −4
Original line number Diff line number Diff line
@@ -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>