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

do not throw BUSY exception for locked status - it is different layers concepts;

Browse Source 
IDEA-103103 org.tmatesoft.sqljet.core.SqlJetException: BUSY: error code is BUSY
This commit is contained in:
irengrig
2013-03-14 18:48:14 +04:00
parent a49c40efea
commit 975320837c
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/svn4idea/src/org/jetbrains/idea/svn/SvnChangeProvider.java
+1 -1
View File
@@ -113,7 +113,7 @@ public class SvnChangeProvider implements ChangeProvider {
throw new VcsException(e.getCause());
} catch (SVNException e) {
if (e.getCause() != null) {
throw new VcsException(e.getMessage() + e.getCause().getMessage(), e);
throw new VcsException(e.getMessage() + " " + e.getCause().getMessage(), e);
}
throw new VcsException(e);
}
plugins/svn4idea/src/org/jetbrains/idea/svn/commandLine/SvnCommandLineStatusClient.java
+3 -5
View File
@@ -26,8 +26,6 @@ import org.jetbrains.idea.svn.Util;
import org.jetbrains.idea.svn.portable.PortableStatus;
import org.jetbrains.idea.svn.portable.SvnExceptionWrapper;
import org.jetbrains.idea.svn.portable.SvnStatusClientI;
import org.tmatesoft.sqljet.core.SqlJetErrorCode;
import org.tmatesoft.sqljet.core.SqlJetException;
import org.tmatesoft.svn.core.*;
import org.tmatesoft.svn.core.internal.util.SVNPathUtil;
import org.tmatesoft.svn.core.wc.*;
@@ -197,10 +195,10 @@ public class SvnCommandLineStatusClient implements SvnStatusClientI {
@Override
public void switchPath() {
final PortableStatus pending = svnHandl[0].getPending();
if (pending.isLocked()) {
/*if (pending.isLocked()) {
throw new SvnExceptionWrapper(new SVNException(SVNErrorMessage.create(SVNErrorCode.SQLITE_ERROR),
new SqlJetException(SqlJetErrorCode.BUSY)));
}
new SqlJetException(SqlJetErrorCode.BUSY, "Working copy is locked for: " + base)));
}*/
pending.setChangelistName(changelistName[0]);
try {
//if (infoBase != null) {