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-98514 (CVS: ITE at sun.reflect.NativeMethodAccessorImpl.invoke0)

Browse Source
This commit is contained in:
Bas Leijdekkers
2013-01-10 15:30:45 +01:00
parent cdbf46f4a1
commit e9dd10476a
1 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/pserver/PServerLoginProviderImpl.java
+18 -13
View File
@@ -75,7 +75,7 @@ public class PServerLoginProviderImpl extends PServerLoginProvider {
}
private void tryConnection() throws AuthenticationException {
IConnection connection = mySettings.createConnection(new ReadWriteStatistics());
final IConnection connection = mySettings.createConnection(new ReadWriteStatistics());
try {
connection.open(new StreamLogger());
mySettings.setOffline(false);
@@ -119,10 +119,11 @@ public class PServerLoginProviderImpl extends PServerLoginProvider {
// TODO do release password ! when opening a connection and there's a problem with authorization
private static void removeAllPasswordsForThisCvsRootFromPasswordFile(String cvsRoot) throws IOException {
File passFile = getPassFile();
if (!passFile.isFile()) return;
List<String> lines = CvsFileUtil.readLinesFrom(passFile, cvsRoot);
final File passFile = getPassFile();
if (!passFile.isFile()) {
return;
}
final List<String> lines = CvsFileUtil.readLinesFrom(passFile, cvsRoot);
try {
CvsFileUtil.storeLines(lines, passFile);
}
@@ -132,18 +133,18 @@ public class PServerLoginProviderImpl extends PServerLoginProvider {
}
private static void storePassword(String stringConfiguration, String scrambledPassword) throws IOException {
File passFile = getPassFile();
final File passFile = getPassFile();
FileUtil.createIfDoesntExist(passFile);
List<String> lines = CvsFileUtil.readLinesFrom(passFile);
final List<String> lines = CvsFileUtil.readLinesFrom(passFile);
lines.add(stringConfiguration + " " + scrambledPassword);
CvsFileUtil.storeLines(lines, passFile);
}
@Nullable
private static String getPassword(String config) {
File passFile = getPassFile();
final File passFile = getPassFile();
try {
BufferedReader reader =
final BufferedReader reader =
new BufferedReader(new InputStreamReader(new FileInputStream(passFile), CvsApplicationLevelConfiguration.getCharset()));
try {
return findPasswordIn(reader, config);
@@ -165,11 +166,15 @@ public class PServerLoginProviderImpl extends PServerLoginProvider {
private static String findPasswordIn(BufferedReader reader, String config) throws IOException {
String line;
while ((line = reader.readLine()) != null) {
int position = line.indexOf(config);
if (position != -1) {
String result = line.substring(position + config.length());
return result.substring(1);
final int position = line.indexOf(config);
if (position == -1) {
continue;
}
final String result = line.substring(position + config.length());
if (result.isEmpty()) {
continue;
}
return result.substring(1);
}
return null;
}