Добавлена обработка ошибки чтения содержимого xdto пакета

Author: theshadowco

src/main/java/com/github/_1c_syntax/bsl/reader/designer/converter/XDTOPackageConverter.java

@@ -22,6 +22,7 @@
 package com.github._1c_syntax.bsl.reader.designer.converter;
 
 import com.github._1c_syntax.bsl.mdo.XDTOPackage;
+import com.github._1c_syntax.bsl.mdo.storage.XdtoPackageData;
 import com.github._1c_syntax.bsl.reader.common.converter.AbstractReadConverter;
 import com.github._1c_syntax.bsl.reader.common.xstream.ExtendXStream;
 import com.thoughtworks.xstream.converters.UnmarshallingContext;
@@ -38,8 +39,16 @@ public class XDTOPackageConverter extends AbstractReadConverter {
   @Override
   public Object unmarshal(HierarchicalStreamReader reader, UnmarshallingContext context) {
     var readerContext = super.read(reader, context);
-    readerContext.setValue(DATA_FIELD,
-      ExtendXStream.read(reader, dataPath(readerContext.getCurrentPath(), readerContext.getName())));
+    XdtoPackageData data;
+    try {
+      data = (XdtoPackageData) ExtendXStream.read(reader,
+        dataPath(readerContext.getCurrentPath(), readerContext.getName()));
+    } catch (Exception e) {
+      // ничего не делаем, считаем файл битым
+      data = XdtoPackageData.EMPTY;
+    }
+
+    readerContext.setValue(DATA_FIELD, data);
     return readerContext.build();
   }
 

src/main/java/com/github/_1c_syntax/bsl/reader/edt/converter/XDTOPackageConverter.java

@@ -22,6 +22,7 @@
 package com.github._1c_syntax.bsl.reader.edt.converter;
 
 import com.github._1c_syntax.bsl.mdo.XDTOPackage;
+import com.github._1c_syntax.bsl.mdo.storage.XdtoPackageData;
 import com.github._1c_syntax.bsl.reader.common.converter.AbstractReadConverter;
 import com.github._1c_syntax.bsl.reader.common.xstream.ExtendXStream;
 import com.thoughtworks.xstream.converters.UnmarshallingContext;
@@ -37,7 +38,15 @@ public class XDTOPackageConverter extends AbstractReadConverter {
   @Override
   public Object unmarshal(HierarchicalStreamReader reader, UnmarshallingContext context) {
     var readerContext = super.read(reader, context);
-    readerContext.setValue(DATA_FIELD, ExtendXStream.read(reader, dataPath(readerContext.getCurrentPath())));
+    XdtoPackageData data;
+    try {
+      data = (XdtoPackageData) ExtendXStream.read(reader, dataPath(readerContext.getCurrentPath()));
+    } catch (Exception e) {
+      // ничего не делаем, считаем файл битым
+      data = XdtoPackageData.EMPTY;
+    }
+
+    readerContext.setValue(DATA_FIELD, data);
     return readerContext.build();
   }
 

src/test/resources/ext/designer/mdclasses/src/cf/XDTOPackages/ПакетXDTO1/Ext/Package.bin

@@ -16,36 +16,11 @@
       "supportVariant": "NONE",
       "namespace": "http://v8.1c.ru/edi/edi_stnd/EnterpriseData/1.8",
       "data": {
-        "targetNamespace": "http://v8.1c.ru/edi/edi_stnd/EnterpriseData/1.8",
-        "imports": [
-          [
-            2
-          ],
-          []
-        ],
-        "valueTypes": [
-          [
-            278
-          ],
-          []
-        ],
-        "objectTypes": [
-          [
-            737
-          ],
-          []
-        ],
-        "properties": [
-          {
-            "name": "performance",
-            "type": "d2p1:Performance",
-            "lowerBound": 0,
-            "upperBound": 0,
-            "nillable": false,
-            "form": "Attribute",
-            "typeDef": []
-          }
-        ]
+        "targetNamespace": "",
+        "imports": [],
+        "valueTypes": [],
+        "objectTypes": [],
+        "properties": []
       }
     }
   ],
@@ -1843,19 +1818,19 @@
   "modalityUseMode": "USE",
   "moduleTypes": [
     [
-      "ManagedApplicationModule",
+      "ExternalConnectionModule",
       [
         1
       ]
     ],
     [
-      "SessionModule",
+      "ManagedApplicationModule",
       [
         1
       ]
     ],
     [
-      "ExternalConnectionModule",
+      "SessionModule",
       [
         1
       ]

src/test/resources/ext/edt/mdclasses/configuration/src/XDTOPackages/ПакетXDTO1/Package.xdto

@@ -16,36 +16,11 @@
       "supportVariant": "NONE",
       "namespace": "http://v8.1c.ru/edi/edi_stnd/EnterpriseData/1.8",
       "data": {
-        "targetNamespace": "http://v8.1c.ru/edi/edi_stnd/EnterpriseData/1.8",
-        "imports": [
-          [
-            2
-          ],
-          []
-        ],
-        "valueTypes": [
-          [
-            278
-          ],
-          []
-        ],
-        "objectTypes": [
-          [
-            737
-          ],
-          []
-        ],
-        "properties": [
-          {
-            "name": "performance",
-            "type": "d2p1:Performance",
-            "lowerBound": 0,
-            "upperBound": 0,
-            "nillable": false,
-            "form": "Attribute",
-            "typeDef": []
-          }
-        ]
+        "targetNamespace": "",
+        "imports": [],
+        "valueTypes": [],
+        "objectTypes": [],
+        "properties": []
       }
     }
   ],
@@ -1838,19 +1813,19 @@
   "modalityUseMode": "USE",
   "moduleTypes": [
     [
-      "ManagedApplicationModule",
+      "ExternalConnectionModule",
       [
         1
       ]
     ],
     [
-      "SessionModule",
+      "ManagedApplicationModule",
       [
         1
       ]
     ],
     [
-      "ExternalConnectionModule",
+      "SessionModule",
       [
         1
       ]