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

fixed "Do not log ProcessCanceledException" exceptions (EA-64570, EA-64491, EA-63606)

Browse Source
This commit is contained in:
Egor.Ushakov
2015-03-18 18:55:16 +03:00
parent 966d3bca89
commit dc15bc5cf2
2 changed files with 52 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/debugger/impl/src/com/intellij/debugger/engine/CompoundPositionManager.java
+49 -91
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2014 JetBrains s.r.o.
* Copyright 2000-2015 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -24,6 +24,7 @@ import com.intellij.debugger.jdi.StackFrameProxyImpl;
import com.intellij.debugger.requests.ClassPrepareRequestor;
import com.intellij.execution.filters.LineNumbersMapping;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.progress.ProcessCanceledException;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.util.ThreeState;
import com.intellij.xdebugger.frame.XStackFrame;
@@ -59,62 +60,55 @@ public class CompoundPositionManager extends PositionManagerEx implements MultiR
private Cache<Location, SourcePosition> mySourcePositionCache = new Cache<Location, SourcePosition>();
private interface Processor<T> {
T process(PositionManager positionManager) throws NoDataException;
}
private <T> T iterate(Processor<T> processor, T defaultValue) {
for (PositionManager positionManager : myPositionManagers) {
try {
return processor.process(positionManager);
}
catch (NoDataException ignored) {}
catch (VMDisconnectedException e) {throw e;}
catch (InternalException ignored) {}
catch (ProcessCanceledException ignored) {}
catch (Exception e) {LOG.error(e);}
catch (AssertionError e) {LOG.error(e);}
}
return defaultValue;
}
@Override
public SourcePosition getSourcePosition(Location location) {
public SourcePosition getSourcePosition(final Location location) {
if (location == null) return null;
SourcePosition res = mySourcePositionCache.get(location);
if (res != null) return res;
for (PositionManager positionManager : myPositionManagers) {
try {
res = positionManager.getSourcePosition(location);
return iterate(new Processor<SourcePosition>() {
@Override
public SourcePosition process(PositionManager positionManager) throws NoDataException {
SourcePosition res = positionManager.getSourcePosition(location);
mySourcePositionCache.put(location, res);
return res;
}
catch (NoDataException ignored) {
}
catch (VMDisconnectedException e) {
throw e;
}
catch (InternalException ignored) {
}
catch (Exception e) {
LOG.error(e);
}
catch (AssertionError e) {
LOG.error(e);
}
}
return null;
}, null);
}
@Override
@NotNull
public List<ReferenceType> getAllClasses(@NotNull SourcePosition classPosition) {
for (PositionManager positionManager : myPositionManagers) {
try {
public List<ReferenceType> getAllClasses(@NotNull final SourcePosition classPosition) {
return iterate(new Processor<List<ReferenceType>>() {
@Override
public List<ReferenceType> process(PositionManager positionManager) throws NoDataException {
return positionManager.getAllClasses(classPosition);
}
catch (NoDataException ignored) {
}
catch (VMDisconnectedException e) {
throw e;
}
catch (InternalException ignored) {
}
catch (Exception e) {
LOG.error(e);
}
catch (AssertionError e) {
LOG.error(e);
}
}
return Collections.emptyList();
}, Collections.<ReferenceType>emptyList());
}
@Override
@NotNull
public List<Location> locationsOfLine(@NotNull ReferenceType type, @NotNull SourcePosition position) {
public List<Location> locationsOfLine(@NotNull final ReferenceType type, @NotNull SourcePosition position) {
VirtualFile file = position.getFile().getVirtualFile();
if (file != null) {
LineNumbersMapping mapping = file.getUserData(LineNumbersMapping.LINE_NUMBERS_MAPPING_KEY);
@@ -126,54 +120,31 @@ public class CompoundPositionManager extends PositionManagerEx implements MultiR
}
}
for (PositionManager positionManager : myPositionManagers) {
try {
return positionManager.locationsOfLine(type, position);
final SourcePosition finalPosition = position;
return iterate(new Processor<List<Location>>() {
@Override
public List<Location> process(PositionManager positionManager) throws NoDataException {
return positionManager.locationsOfLine(type, finalPosition);
}
catch (NoDataException ignored) {
}
catch (VMDisconnectedException e) {
throw e;
}
catch (InternalException ignored) {
}
catch (Exception e) {
LOG.error(e);
}
catch (AssertionError e) {
LOG.error(e);
}
}
return Collections.emptyList();
}, Collections.<Location>emptyList());
}
@Override
public ClassPrepareRequest createPrepareRequest(@NotNull ClassPrepareRequestor requestor, @NotNull SourcePosition position) {
for (PositionManager positionManager : myPositionManagers) {
try {
public ClassPrepareRequest createPrepareRequest(@NotNull final ClassPrepareRequestor requestor, @NotNull final SourcePosition position) {
return iterate(new Processor<ClassPrepareRequest>() {
@Override
public ClassPrepareRequest process(PositionManager positionManager) throws NoDataException {
return positionManager.createPrepareRequest(requestor, position);
}
catch (NoDataException ignored) {
}
catch (VMDisconnectedException e) {
throw e;
}
catch (Exception e) {
LOG.error(e);
}
catch (AssertionError e) {
LOG.error(e);
}
}
return null;
}, null);
}
@NotNull
@Override
public List<ClassPrepareRequest> createPrepareRequests(@NotNull ClassPrepareRequestor requestor, @NotNull SourcePosition position) {
for (PositionManager positionManager : myPositionManagers) {
try {
public List<ClassPrepareRequest> createPrepareRequests(@NotNull final ClassPrepareRequestor requestor, @NotNull final SourcePosition position) {
return iterate(new Processor<List<ClassPrepareRequest>>() {
@Override
public List<ClassPrepareRequest> process(PositionManager positionManager) throws NoDataException {
if (positionManager instanceof MultiRequestPositionManager) {
return ((MultiRequestPositionManager)positionManager).createPrepareRequests(requestor, position);
}
@@ -185,20 +156,7 @@ public class CompoundPositionManager extends PositionManagerEx implements MultiR
return Collections.singletonList(prepareRequest);
}
}
catch (NoDataException ignored) {
}
catch (VMDisconnectedException e) {
throw e;
}
catch (Exception e) {
LOG.error(e);
}
catch (AssertionError e) {
LOG.error(e);
}
}
return Collections.emptyList();
}, Collections.<ClassPrepareRequest>emptyList());
}
@Nullable
java/debugger/impl/src/com/intellij/debugger/impl/InvokeThread.java
+3 -1
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2014 JetBrains s.r.o.
* Copyright 2000-2015 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@ package com.intellij.debugger.impl;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.progress.ProcessCanceledException;
import com.intellij.openapi.project.DumbService;
import com.intellij.openapi.project.Project;
import com.sun.jdi.VMDisconnectedException;
@@ -157,6 +158,7 @@ public abstract class InvokeThread<E extends PrioritizedTask> {
catch (EventQueueClosedException ignored) {
break;
}
catch (ProcessCanceledException ignored) {}
catch (RuntimeException e) {
if(e.getCause() instanceof InterruptedException) {
break;