Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions session_factory.go
Original file line number Diff line number Diff line change
Expand Up @@ -147,16 +147,16 @@ func (f sessionFactory) newSession(

if s.transportDataDictionary, err = datadictionary.Parse(transportDataDictionaryPath); err != nil {
err = errors.Wrapf(
err, "problem parsing XML datadictionary path '%v' for setting '%v",
settings.settings[config.TransportDataDictionary], config.TransportDataDictionary,
err, "problem parsing XML datadictionary path '%v' for setting '%v'",
string(settings.settings[config.TransportDataDictionary]), config.TransportDataDictionary,
)
return
}

if s.appDataDictionary, err = datadictionary.Parse(appDataDictionaryPath); err != nil {
err = errors.Wrapf(
err, "problem parsing XML datadictionary path '%v' for setting '%v",
settings.settings[config.AppDataDictionary], config.AppDataDictionary,
err, "problem parsing XML datadictionary path '%v' for setting '%v'",
string(settings.settings[config.AppDataDictionary]), config.AppDataDictionary,
)
return
}
Expand All @@ -171,8 +171,8 @@ func (f sessionFactory) newSession(

if s.appDataDictionary, err = datadictionary.Parse(dataDictionaryPath); err != nil {
err = errors.Wrapf(
err, "problem parsing XML datadictionary path '%v' for setting '%v",
settings.settings[config.DataDictionary], config.DataDictionary,
err, "problem parsing XML datadictionary path '%v' for setting '%v'",
string(settings.settings[config.DataDictionary]), config.DataDictionary,
)
return
}
Expand Down
8 changes: 8 additions & 0 deletions session_factory_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -744,3 +744,11 @@ func (s *SessionFactorySuite) TestPersistMessages() {
s.Equal(test.expected, session.DisableMessagePersist)
}
}

func (s *SessionFactorySuite) TestBadDictionaryPath() {
s.SetupTest()
s.SessionSettings.Set(config.DataDictionary, "file/does/not/exist.xml")
_, err := s.newSession(s.SessionID, s.MessageStoreFactory, s.SessionSettings, s.LogFactory, s.App)
s.NotNil(err)
s.Contains(err.Error(), "problem parsing XML datadictionary path 'file/does/not/exist.xml' for setting 'DataDictionary':")
}
Loading