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

CVS: NPE if no CVS installed

Browse Source
This commit is contained in:
irengrig
2010-12-13 14:07:32 +03:00
parent f0f3323255
commit ebeb5fc74c
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/ConnectionOnProcess.java
+12 -4
View File
@@ -59,8 +59,12 @@ public abstract class ConnectionOnProcess implements IConnection {
}
public synchronized void close() throws IOException {
myWaitForThreadFuture.cancel(true);
myWaitSemaphore.up();
if (myWaitForThreadFuture != null) {
myWaitForThreadFuture.cancel(true);
}
if (myWaitSemaphore != null) {
myWaitSemaphore.up();
}
try {
if (myInputStream != null && !myContainsError) {
@@ -84,8 +88,12 @@ public abstract class ConnectionOnProcess implements IConnection {
}
try {
myErrThread.setProcessTerminated(true);
myStdErrFuture.get();
if (myErrThread != null) {
myErrThread.setProcessTerminated(true);
}
if (myStdErrFuture != null) {
myStdErrFuture.get();
}
}
catch (InterruptedException e) {
//