Changeset 6677

Timestamp:

Jan 13, 2015, 8:15:08 AM (7 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #1905: BASE does not warn about duplicate raw data types defined in different files

File:

• branches/3.4-stable/src/core/net/sf/basedb/core/RawDataTypes.java (modified) (3 diffs)

branches/3.4-stable/src/core/net/sf/basedb/core/RawDataTypes.java

@@ -161 +161 @@
   {
     List<String> files = Application.getRawDataTypeFiles();
+    Set<String> usedNames = new HashSet<String>();
     try
     {
@@ -166 +167 @@
       {
         Document dom = XmlUtil2.getValidatedXml(RawDataTypes.class.getResource(xmlFile), dtdFile);
-        loadRawDataTypes(dom, xmlFile);
+        loadRawDataTypes(usedNames, dom, xmlFile);
         log.info("Loaded raw data types from file: " + xmlFile);
       }
@@ -334 +335 @@
     {@link #rawDataTypes} map.
   */
-  private static void loadRawDataTypes(Document dom, String xmlFile)
+  private static void loadRawDataTypes(Set<String> usedNames, Document dom, String xmlFile)
   {
     List<Element> rawDataTypeTags = dom.getRootElement().getChildren("raw-data-type");
     DbEngine engine = HibernateUtil.getDbEngine();
-    Set<String> usedNames = new HashSet<String>();
     for (Element el : rawDataTypeTags)
     {