Issue#935 #1024
Merged
Issue#935 #1024
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
| @@ -432,15 +509,13 @@ public File copySoundFile(String path) throws IOException, IllegalArgumentExcept | |||
| File outputFile = new File(buildPath(soundDirectory.getAbsolutePath(), | |||
| inputFileChecksum + "_" + inputFile.getName())); | |||
|
|
|||
| return copyFileAddCheckSum(outputFile, inputFile, soundDirectory); | |||
There was a problem hiding this comment.
the 3rd parameter was marked as unused, I traced it and there was no usage of it
|
Please rebase and squash into one commit. |
* New Writing Process: 1. Write to tmp_code.xml 2. Delete code.xml 3. (usually atomic) rename tmp_code.xml --> code.xml * New SanityCheck for saveProject, loadProject * Solved Locking issue with xstream * Solved 3 fails in Speakbricktest + 1 test in utilstest
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.
Incoming Jenkins testrun:
https://jenkins.catrob.at/view/All-Categories/view/Catroid-multi-job/job/Catroid-Multi-Job-Custom-Branch/1937/
Process How Files are getting saved (in order to avoid data loss):
You have 3 steps. During/Before/After the first 2 steps (The renaming should be atomic on Linux/Android) an error can occur, this will be checked within the SanityCheckFunction().
-- Filestate: code.xml
-- Filestate: code.xml tmp_code.xml
-- Filestate: tmp_code.xml
-- Filestate: code.xml
To make things clearer:
SanityCheckFunction only needs to verify 2 states.
Either tmp_code.xml AND code.xml exist:
-Then it has to delete tmp_code.xml as this state only occurs during/after step 1 and before step 2.
Or only tmp_code.xml exists
-then it has to rename tmp_code.xml to code.xml. This state can only occur after step 2 but before step 3.
@aried3r