Skip to content

Annotation ConcurrentModificationException during compilation #140

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
kmader wants to merge 6 commits into from
Closed

Annotation ConcurrentModificationException during compilation #140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0526b88
Merge pull request #1 from scijava/master
kmader Dec 5, 2014
166f59b
changed to concurrent supported map
kmader Dec 5, 2014
33cdbb1
Merge branch 'master' of https://github.com/4Quant/scijava-common
kmader Dec 5, 2014
91829d0
added new code to make debugging problems with the annotation process…
kmader Jan 21, 2015
41e9319
Merge pull request #2 from scijava/master
kmader Jan 21, 2015
fe4999b
Merge branch 'master' of https://github.com/4Quant/scijava-common
kmader Jan 21, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/main/java/org/scijava/annotations/AbstractIndexWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
import java.util.Map;
import java.util.Map.Entry;
import java.util.TreeMap;
import java.util.concurrent.ConcurrentSkipListMap;

import javax.lang.model.element.AnnotationValue;

Expand All @@ -60,7 +61,7 @@
public abstract class AbstractIndexWriter {

private final Map<String, Map<String, Object>> map =
new TreeMap<String, Map<String, Object>>();
new ConcurrentSkipListMap<String, Map<String, Object>>();

protected synchronized boolean foundAnnotations() {
return !map.isEmpty();
Expand Down Expand Up @@ -137,7 +138,7 @@ protected synchronized void merge(final String annotationName,
int changedCount = map.size();
boolean hasObsoletes = false;

final IndexReader reader = new IndexReader(in);
final IndexReader reader = new IndexReader(in,annotationName+" from "+in);
try {
for (;;) {
@SuppressWarnings("unchecked")
Expand Down
16 changes: 14 additions & 2 deletions src/main/java/org/scijava/annotations/IndexReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,13 +64,23 @@
class IndexReader {

private final PushbackInputStream in;
private final String originalISName;

IndexReader(final InputStream in) {
this.in =
in instanceof PushbackInputStream ? (PushbackInputStream) in
: new PushbackInputStream(new BufferedInputStream(in));
this.originalISName="";
}

IndexReader(final InputStream in,final String isName) {
this.in =
in instanceof PushbackInputStream ? (PushbackInputStream) in
: new PushbackInputStream(new BufferedInputStream(in));
this.originalISName=isName;
}


public Object next() throws IOException {
int c = in.read();
while (Character.isWhitespace(c)) c = in.read();
Expand Down Expand Up @@ -155,7 +165,8 @@ else if (c < '0' || c > '9') {
if (c == '"') {
return readString();
}
throw new IOException("Unexpected char: '" + (char) c + "'");
throw new IOException("Unexpected char: '" + (char) c + "'"+
((originalISName.length()>0) ? " from "+originalISName : ""));
}

public void close() throws IOException {
Expand Down Expand Up @@ -206,7 +217,7 @@ private int expect(char a, char b) throws IOException {
return 1;
}
throw new IOException("Expected '" + a + "' or '" + b + "', got '" +
(char) c + "'");
(char) c + "'"+((originalISName.length()>0) ? " from "+originalISName : ""));
}

private void expect(String match) throws IOException {
Expand All @@ -217,6 +228,7 @@ private void expect(String match) throws IOException {

private IndexReader() {
this.in = null;
this.originalISName="";
}

static IndexReader getLegacyReader(final InputStream in) throws IOException {
Expand Down