mirror of
https://github.com/NationalSecurityAgency/ghidra.git
synced 2026-08-08 07:40:39 -09:00
Merge remote-tracking branch 'origin/patch'
This commit is contained in:
@@ -375,7 +375,6 @@ public class LocalManagedBufferFile extends LocalBufferFile implements ManagedBu
|
||||
super.setReadOnly();
|
||||
|
||||
if (openForUpdate) {
|
||||
openForUpdate = false;
|
||||
bfMgr.versionCreated(version, comment, checkinId);
|
||||
startPreSave();
|
||||
}
|
||||
|
||||
@@ -250,7 +250,7 @@ public abstract class LocalFolderItem implements FolderItem {
|
||||
throw new FileInUseException("Another checkin is in progress" + byMsg);
|
||||
}
|
||||
checkinId = checkoutId;
|
||||
//Log.put("Check-in started: " + checkinId);
|
||||
//log.info("Check-in started: " + checkinId);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -262,7 +262,7 @@ public abstract class LocalFolderItem implements FolderItem {
|
||||
synchronized (fileSystem) {
|
||||
if (this.checkinId == itemCheckinId) {
|
||||
this.checkinId = DEFAULT_CHECKOUT_ID;
|
||||
//Log.put("Check-in ended: " + checkinId);
|
||||
//log.info("Check-in ended: " + itemCheckinId);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user