Merge branch 'master' of https://github.com/EnFlexIT/AgentWorkbench.git

EnFlexIT · Aug 2, 2022 · c8e4447 · c8e4447
2 parents 65438f8 + c8dc5dc
commit c8e4447
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/...b/bundles/de.enflexit.db.hibernate/src/de/enflexit/db/hibernate/gui/DatabaseSettings.java b/...b/bundles/de.enflexit.db.hibernate/src/de/enflexit/db/hibernate/gui/DatabaseSettings.java
@@ -114,13 +114,14 @@ public boolean equals(Object compareObject) {
 			DatabaseSettings compareSettings = (DatabaseSettings) compareObject;
 
 			// --- Compare the database system name -------------------------------------
-			if (compareSettings.getDatabaseSystemName().equals(this.getDatabaseSystemName())==false) return false;
+			String databaseSystemNameComp = compareSettings.getDatabaseSystemName();
+			String databaseSystemNameLocal = this.getDatabaseSystemName();
+			if ((databaseSystemNameComp==null && databaseSystemNameLocal!=null) || (databaseSystemNameComp!=null && databaseSystemNameLocal==null)) return false;
+			if (databaseSystemNameComp!=null && databaseSystemNameLocal!=null && compareSettings.getDatabaseSystemName().equals(this.getDatabaseSystemName())==false) return false;
 
 			// --- Compare the hibernate database settings ------------------------------
 			Properties propertiesCompare = compareSettings.getHibernateDatabaseSettings();
 			Properties propertiesLocal = this.getHibernateDatabaseSettings();
-			if (propertiesCompare==null && propertiesLocal==null) return true;
-
 			if ((propertiesCompare==null && propertiesLocal!=null) || (propertiesCompare!=null && propertiesLocal==null)) return false;
 			if (compareSettings.getHibernateDatabaseSettings().size()!=this.getHibernateDatabaseSettings().size()) return false;
 

diff --git a/eclipseProjects/de.enflexit.awb/features/de.enflexit.common.feature/feature.xml b/eclipseProjects/de.enflexit.awb/features/de.enflexit.common.feature/feature.xml
@@ -107,4 +107,11 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="com.google.gson"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>