MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

assert isLocked in write

Browse Source
This commit is contained in:
Maxim.Mossienko
2014-11-07 16:00:43 +01:00
parent 5afd240e66
commit 277cd99f9c
2 changed files with 9 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lvcs-impl/src/com/intellij/history/core/changes/ChangeSet.java
+7 -19
View File
@@ -19,7 +19,6 @@ package com.intellij.history.core.changes;
import com.intellij.history.core.Content;
import com.intellij.history.core.StreamUtil;
import com.intellij.history.utils.LocalHistoryLog;
import com.intellij.openapi.util.Ref;
import com.intellij.util.Producer;
import com.intellij.util.SmartList;
import com.intellij.util.containers.ContainerUtil;
@@ -61,27 +60,16 @@ public class ChangeSet {
isLocked = true;
}
public void write(final DataOutput out) throws IOException {
public void write(DataOutput out) throws IOException {
LocalHistoryLog.LOG.assertTrue(isLocked, "Changeset should be locked");
out.writeLong(myId);
StreamUtil.writeStringOrNull(out, myName);
out.writeLong(myTimestamp);
final Ref<IOException> ref = new Ref<IOException>();
accessChanges(new Runnable() {
@Override
public void run() {
try {
out.writeInt(myChanges.size());
for (Change c : myChanges) {
StreamUtil.writeChange(out, c);
}
}
catch (IOException e) {
ref.set(e);
}
}
});
if (ref.get() != null) throw ref.get();
out.writeInt(myChanges.size());
for (Change c : myChanges) {
StreamUtil.writeChange(out, c);
}
}
public void setName(@Nullable String name) {
@@ -131,7 +119,7 @@ public class ChangeSet {
}
public void addChange(final Change c) {
LocalHistoryLog.LOG.assertTrue(!isLocked, "Changset is already locked");
LocalHistoryLog.LOG.assertTrue(!isLocked, "Changeset is already locked");
accessChanges(new Runnable() {
@Override
public void run() {
platform/platform-tests/testSrc/com/intellij/history/core/storage/StreamTest.java
+2 -2
View File
@@ -260,7 +260,7 @@ public class StreamTest extends LocalHistoryTestCase {
@Test
public void testChangeSet() throws IOException {
ChangeSet cs = cs(123, "name", new CreateFileChange(nextId(), "file"));
cs.lock();
cs.write(os);
ChangeSet read = new ChangeSet(is);
@@ -275,7 +275,7 @@ public class StreamTest extends LocalHistoryTestCase {
@Test
public void testChangeSetWithoutName() throws IOException {
ChangeSet cs = cs((String)null);
cs.lock();
cs.write(os);
ChangeSet read = new ChangeSet(is);