MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-18 09:34:34 +07:00
Code Issues Packages Projects Releases Wiki Activity

Maven: do not try to update broken indices repeatedly, UnsupportedExistingIndicesException fixed (IDEA-67512)

Browse Source
This commit is contained in:
Anton Makeev
2011-11-24 16:14:22 +01:00
parent 798be53d5d
commit 089f90fa02
4 changed files with 49 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/maven/maven-server-api/src/org/jetbrains/idea/maven/model/MavenId.java
+1 -1
View File
@@ -66,7 +66,7 @@ public class MavenId implements Serializable {
public static void append(StringBuilder builder, String part) {
if (builder.length() != 0) builder.append(':');
builder.append(part);
builder.append(part == null ? "<unknown>" : part);
}
@Override
plugins/maven/maven2-server-impl/src/org/jetbrains/idea/maven/server/embedder/Maven2ServerIndexerImpl.java
+31 -31
View File
@@ -77,13 +77,13 @@ public class Maven2ServerIndexerImpl extends MavenRemoteObject implements MavenS
@Nullable String url,
@NotNull File indexDir) throws MavenServerIndexerException {
try {
IndexingContext context = myIndexer.addIndexingContext(indexId,
repositoryId,
file,
indexDir,
url,
null, // repo update url
NexusIndexer.FULL_INDEX);
IndexingContext context = myIndexer.addIndexingContextForced(indexId,
repositoryId,
file,
indexDir,
url,
null, // repo update url
NexusIndexer.FULL_INDEX);
int id = System.identityHashCode(context);
myIndices.put(id, context);
return id;
@@ -143,31 +143,31 @@ public class Maven2ServerIndexerImpl extends MavenRemoteObject implements MavenS
Maven2ServerEmbedderImpl embedder = Maven2ServerEmbedderImpl.create(settings);
try {
request.setResourceFetcher(new Maven2ServerIndexFetcher(index.getRepositoryId(),
index.getRepositoryUrl(),
embedder.getComponent(WagonManager.class),
new TransferListenerAdapter(indicator) {
@Override
protected void downloadProgress(long downloaded, long total) {
super.downloadProgress(downloaded, total);
try {
myIndicator.setFraction(((double)downloaded) / total);
}
catch (RemoteException e) {
throw new RuntimeRemoteException(e);
}
}
index.getRepositoryUrl(),
embedder.getComponent(WagonManager.class),
new TransferListenerAdapter(indicator) {
@Override
protected void downloadProgress(long downloaded, long total) {
super.downloadProgress(downloaded, total);
try {
myIndicator.setFraction(((double)downloaded) / total);
}
catch (RemoteException e) {
throw new RuntimeRemoteException(e);
}
}
@Override
public void transferCompleted(TransferEvent event) {
super.transferCompleted(event);
try {
myIndicator.setText2("Processing indices...");
}
catch (RemoteException e) {
throw new RuntimeRemoteException(e);
}
}
}));
@Override
public void transferCompleted(TransferEvent event) {
super.transferCompleted(event);
try {
myIndicator.setText2("Processing indices...");
}
catch (RemoteException e) {
throw new RuntimeRemoteException(e);
}
}
}));
myUpdater.fetchAndUpdateIndex(request);
}
finally {
plugins/maven/src/main/java/org/jetbrains/idea/maven/indices/MavenIndex.java
+9 -4
View File
@@ -162,7 +162,7 @@ public class MavenIndex {
catch (Exception e2) {
throw new MavenIndexException("Cannot open index " + myDir.getPath(), e2);
}
isBroken = true;
markAsBroken();
}
}
finally {
@@ -581,12 +581,17 @@ public class MavenIndex {
}
}
}
isBroken = true;
myListener.indexIsBroken(this);
markAsBroken();
return defaultValue;
}
private void markAsBroken() {
if (!isBroken) {
myListener.indexIsBroken(this);
}
isBroken = true;
}
private interface IndexTask<T> {
T doTask() throws Exception;
}
plugins/maven/src/test/java/org/jetbrains/idea/maven/indices/MavenIndicesTest.java
+8
View File
@@ -274,6 +274,14 @@ public class MavenIndicesTest extends MavenIndicesTestCase {
myIndices.updateOrRepair(i, true, getMavenGeneralSettings(), EMPTY_MAVEN_PROCESS);
}
public void testFoo() throws Exception {
myIndices.add("id", myRepositoryHelper.getTestDataPath("local1"), MavenIndex.Kind.LOCAL);
shutdownIndices();
initIndices();
assertFalse(isBroken);
}
public void testSavingFailureMessage() throws Exception {
MavenIndex i = myIndices.add("id", "xxx", MavenIndex.Kind.REMOTE);
myIndices.updateOrRepair(i, true, getMavenGeneralSettings(), EMPTY_MAVEN_PROCESS);