Fixes #2550

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/CdmMetaDataAwareDataSourceContainer.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/CdmMetaDataAwareDataSourceContainer.java
index 9c3097df4bd2b6a6ce70950d95f414c90d985c97..f64a6b59b6166b19eaad75e2dfaa3784d0979017 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/CdmMetaDataAwareDataSourceContainer.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/CdmMetaDataAwareDataSourceContainer.java
@@ -66,6 +66,9 @@ public class CdmMetaDataAwareDataSourceContainer {
                        running = dataSource.testConnection();
                } catch (Exception e) {
                        running = false;
+                       for(MetaDataPropertyName metaDataPropertyName : MetaDataPropertyName.values()){
+                               metaDataMap.put(metaDataPropertyName, DEFAULT_ENTRY);                                   
+                       }
                }
                
                try {
@@ -114,7 +117,7 @@ public class CdmMetaDataAwareDataSourceContainer {
         */
        public boolean isDataSourceCompatible(){
                String version = metaDataMap.get(MetaDataPropertyName.DB_SCHEMA_VERSION);
-               return version == null ? false : CdmMetaData.isDbSchemaVersionCompatible(version);
+               return version == null || version.equals(DEFAULT_ENTRY) ? false : CdmMetaData.isDbSchemaVersionCompatible(version);
        }
 
        /**

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/handler/EditDataSourceHandler.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/handler/EditDataSourceHandler.java
index 7bfc465b252483912ced60feb64d30976843939b..36c9696406d8ddb1cf9c36bc6b339994704b06ed 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/handler/EditDataSourceHandler.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/handler/EditDataSourceHandler.java
@@ -45,7 +45,9 @@ public class EditDataSourceHandler extends AbstractDataSourceHandler {
                if(result == IStatus.OK){
                        CdmDataSourceViewPart view = (CdmDataSourceViewPart) StoreUtil.getView(CdmDataSourceViewPart.ID, false);
                        if(view != null){
+                               container.getMetaDataFromDataSource();
                                view.getViewer().update(new CdmMetaDataAwareDataSourceContainer[]{container}, null);
+
                        }       
                }