Skip to content

check for initialized session validator before validating message #128

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 5, 2016
Merged

check for initialized session validator before validating message #128

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
40 changes: 19 additions & 21 deletions session.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,38 +69,34 @@ func createSession(sessionID SessionID, storeFactory MessageStoreFactory, settin
//If the transport or app data dictionary setting is set, the other also needs to be set.
hasTransportDataDictionary := settings.HasSetting(config.TransportDataDictionary)
hasAppDataDictionary := settings.HasSetting(config.AppDataDictionary)
if hasTransportDataDictionary != hasAppDataDictionary {
if hasTransportDataDictionary {
return requiredConfigurationMissing(config.AppDataDictionary)
} else {
return requiredConfigurationMissing(config.TransportDataDictionary)
}
}

var transportDataDictionary *datadictionary.DataDictionary
if transportDataDictionaryPath, err := settings.Setting(config.TransportDataDictionary); err == nil {
if transportDataDictionary, err = datadictionary.Parse(transportDataDictionaryPath); err != nil {
if hasTransportDataDictionary && hasAppDataDictionary {
transportDataDictionaryPath, _ := settings.Setting(config.TransportDataDictionary)
transportDataDictionary, err := datadictionary.Parse(transportDataDictionaryPath)
if err != nil {
return err
}
}

var appDataDictionary *datadictionary.DataDictionary
if appDataDictionaryPath, err := settings.Setting(config.AppDataDictionary); err == nil {
if appDataDictionary, err = datadictionary.Parse(appDataDictionaryPath); err != nil {
appDataDictionaryPath, _ := settings.Setting(config.AppDataDictionary)
appDataDictionary, err := datadictionary.Parse(appDataDictionaryPath)
if err != nil {
return err
}
}

session.validator = &fixtValidator{transportDataDictionary, appDataDictionary, validatorSettings}
session.validator = &fixtValidator{transportDataDictionary, appDataDictionary, validatorSettings}
} else if hasTransportDataDictionary {
return requiredConfigurationMissing(config.AppDataDictionary)
} else if hasAppDataDictionary {
return requiredConfigurationMissing(config.TransportDataDictionary)
}
} else {
var dataDictionary *datadictionary.DataDictionary
if dataDictionaryPath, err := settings.Setting(config.DataDictionary); err == nil {
if dataDictionary, err = datadictionary.Parse(dataDictionaryPath); err != nil {
return err
}
}

session.validator = &fixValidator{dataDictionary, validatorSettings}
session.validator = &fixValidator{dataDictionary, validatorSettings}
}
}

if settings.HasSetting(config.ResetOnLogon) {
Expand Down Expand Up @@ -362,8 +358,10 @@ func (s *session) verifySelect(msg Message, checkTooHigh bool, checkTooLow bool)
}
}

if reject := s.validator.Validate(msg); reject != nil {
return reject
if s.validator != nil {
if reject := s.validator.Validate(msg); reject != nil {
return reject
}
}

return s.fromCallback(msg)
Expand Down