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

IDEA-57345: "Error: null" during make (NPE in ArtifactsCompilerInstance.deleteFiles)

Browse Source
This commit is contained in:
nik
2010-08-11 09:34:52 +04:00
parent 04c48c8338
commit cd528f1ab0
2 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/compiler/impl/src/com/intellij/compiler/impl/generic/GenericCompilerCache.java
+1 -1
View File
@@ -80,7 +80,7 @@ public class GenericCompilerCache<Key, SourceState, OutputState> {
}
public void processSources(final int targetId, final Processor<Key> processor) throws IOException {
myPersistentMap.processKeys(new Processor<KeyAndTargetData<Key>>() {
myPersistentMap.processKeysWithExistingMapping(new Processor<KeyAndTargetData<Key>>() {
@Override
public boolean process(KeyAndTargetData<Key> data) {
return targetId == data.myTarget ? processor.process(data.myKey) : true;
platform/util/src/com/intellij/util/io/PersistentHashMap.java
+15 -2
View File
@@ -17,6 +17,7 @@ package com.intellij.util.io;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.util.io.FileUtil;
import com.intellij.util.CommonProcessors;
import com.intellij.util.Processor;
import com.intellij.util.containers.LimitedPool;
import com.intellij.util.containers.SLRUCache;
@@ -24,7 +25,9 @@ import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import java.io.*;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
/**
* @author Eugene Zhuravlev
@@ -213,6 +216,10 @@ public class PersistentHashMap<Key, Value> extends PersistentEnumerator<Key>{
}
}
/**
* Process all keys registered in the map. Note that keys which were removed after {@link #compact()} call will be processed as well. Use
* {@link #processKeysWithExistingMapping(com.intellij.util.Processor)} to process only keys with existing mappings
*/
public synchronized boolean processKeys(Processor<Key> processor) throws IOException {
synchronized (ourLock) {
myAppendCache.clear();
@@ -220,9 +227,15 @@ public class PersistentHashMap<Key, Value> extends PersistentEnumerator<Key>{
}
}
public synchronized Collection<Key> getAllKeysWithExistingMapping() throws IOException {
public Collection<Key> getAllKeysWithExistingMapping() throws IOException {
final List<Key> values = new ArrayList<Key>();
processKeysWithExistingMapping(new CommonProcessors.CollectProcessor<Key>(values));
return values;
}
public synchronized boolean processKeysWithExistingMapping(Processor<Key> processor) throws IOException {
synchronized (ourLock) {
return getAllDataObjects(new DataFilter() {
return processAllDataObject(processor, new DataFilter() {
public boolean accept(final int id) {
try {
return readValueId(id).address != NULL_ADDR;