Changeset 1337 for trunk

Timestamp:

04/30/19 13:42:57 (5 years ago)

Author:

bln4

Message:

Committed a fix to hopefully address the File modify conflict issue (or at least some of the situations it occurs). I have noticed that the times that cause problems are when there is a version 0 frame being saved. I do not completely understand why this is happening or why it triggers the conflict check, but it appears that version 0 frames do not exist in memory for long, being overridden almost instantly. Maybe something to do with how frames are created?

Prior to this we found that the problem could be forced by creating a new frameset, adding the @old annotation and then navigating away, this no longer occurs.

File:

• trunk/src/org/expeditee/gui/FrameIO.java (modified) (1 diff)

trunk/src/org/expeditee/gui/FrameIO.java

@@ -1231 +1231 @@
                                         framesetName.equalsIgnoreCase(MessageBay.MESSAGES_FRAMESET_NAME) || 
                                         framesetName.equalsIgnoreCase(MailBay.EXPEDITEE_MAIL_FRAMESET_NAME);
+                        long fileLastModify = fullPath != null ? new File(fullPath).lastModified() : 0;
                         long frameLastModify = toSave.getLastModifyPrecise();
-                        long fileLastModify = new File(toSave.getFramePathReal()).lastModified();
                         boolean fileModifyConflict = fileLastModify > frameLastModify && !isBayFrameset;
                         boolean versionConflict = savedVersion > toSave.getVersion() && !isBayFrameset;
-                        if (fileModifyConflict || versionConflict) {
+                        if ((fileModifyConflict || versionConflict) && savedVersion > 0) {
                                 // remove this frame from the cache if it is there
                                 // This will make sure links to the original are set correctly