Skip to content

Commit 845446c

Browse files
committed
fix(RabbitMQConfig): handle XML parsing errors for RabbitMQ configuration
1 parent 5316b28 commit 845446c

2 files changed

Lines changed: 19 additions & 0 deletions

File tree

src/NeTrainSimRabbitMQConfig/RabbitMQConfigDialog.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,11 @@ void RabbitMQConfigDialog::loadConfig()
130130
}
131131

132132
QDomDocument doc;
133+
#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
133134
auto result = doc.setContent(&file);
135+
#else
136+
bool result = doc.setContent(&file);
137+
#endif
134138
file.close();
135139
if (!result)
136140
{

src/NeTrainSimServer/simulationserver.cpp

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ void SimulationServer::loadRabbitMQConfig()
102102
}
103103

104104
QDomDocument doc;
105+
#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
105106
auto result = doc.setContent(&file);
106107
file.close();
107108

@@ -112,6 +113,20 @@ void SimulationServer::loadRabbitMQConfig()
112113
<< result.errorLine;
113114
return;
114115
}
116+
#else
117+
QString errorMsg;
118+
int errorLine = 0;
119+
bool result = doc.setContent(&file, &errorMsg, &errorLine);
120+
file.close();
121+
122+
if (!result)
123+
{
124+
qWarning() << "Failed to parse RabbitMQ config XML:"
125+
<< errorMsg << "at line"
126+
<< errorLine;
127+
return;
128+
}
129+
#endif
115130

116131
QDomElement root = doc.documentElement();
117132
if (root.tagName() != "rabbitmq")

0 commit comments

Comments
 (0)