Fixes #7442: License file is not generated any more #971
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
fanf
force-pushed
the
bug_7442/license_file_is_not_generated_any_more
branch
from
24b979a
to
1a05294
Compare
| logger.debug("Loading License") | ||
| val license = NovaLicense.parseXml(elt) | ||
| licenseMap.put(license.uuid, license) | ||
| private[this] def loadLicenses(): Box[Unit] = { |
There was a problem hiding this comment.
Why not returning the map here and get rid of the mutable var which saddens me :(
There was a problem hiding this comment.
i indeed fail to see the benefit of the map, a def returning the result would do the same, especially since we are now loading the licences at each generation
fanf
force-pushed
the
bug_7442/license_file_is_not_generated_any_more
branch
from
1a05294
to
f554b0d
Compare
VinceMacBuche
added a commit
that referenced
this pull request
Nov 23, 2015
…ted_any_more Fixes #7442: License file is not generated any more
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
https://www.rudder-project.org/redmine/issues/7442
Alternative to #970 with some refactoring so that:
Summary: we are getting all the licenses info at the begining of the generation process, and give that map of (nodeId, licenses) to systemVariableService and promiseWritter so they can use it directly without re-reading XML and with consistent data all along generation process.