Skip to content

The Unified and Autonomous Development Platform

fix: Possible infinite loop when extract symbols from js file (OD-2826)

Robin Shena2a210d99c36
diff --git a/pom.xml b/pom.xml
index 4a4202270a..5103732a15 100644
--- a/pom.xml
+++ b/pom.xml
@@ -681,8 +681,8 @@
</repository>
</repositories>
<properties>
- <commons.version>4.0.0</commons.version>
- <agent.version>3.1.4</agent.version>
+ <commons.version>4.0.1</commons.version>
+ <agent.version>3.1.5</agent.version>
<slf4j.version>2.0.9</slf4j.version>
<logback.version>1.4.14</logback.version>
<antlr.version>4.7.2</antlr.version>
diff --git a/server-core/src/main/java/io/onedev/server/search/code/DefaultCodeIndexService.java b/server-core/src/main/java/io/onedev/server/search/code/DefaultCodeIndexService.java
index 05aff75670..9158ea0bc9 100644
--- a/server-core/src/main/java/io/onedev/server/search/code/DefaultCodeIndexService.java
+++ b/server-core/src/main/java/io/onedev/server/search/code/DefaultCodeIndexService.java
@@ -250,6 +250,7 @@ public class DefaultCodeIndexService implements CodeIndexService, Serializable {
SymbolExtractor<Symbol> extractor, ObjectId blobId, String blobPath) throws IOException {
Document document = new Document();
+ logger.trace("Indexing blob '{}'...", blobPath);
document.add(new StoredField(BLOB_INDEX_VERSION.name(), getIndexVersion(extractor)));
document.add(new StringField(BLOB_HASH.name(), blobId.name(), Store.NO));
document.add(new StringField(BLOB_PATH.name(), blobPath, Store.NO));
@@ -302,6 +303,7 @@ public class DefaultCodeIndexService implements CodeIndexService, Serializable {
}
writer.addDocument(document);
+ logger.trace("Indexed blob '{}'.", blobPath);
}
private BatchWorker getBatchWorker(Long projectId) {
diff --git a/server-ee b/server-ee
index c3f63997ab..072bbf7178 160000
--- a/server-ee
+++ b/server-ee
@@ -1 +1 @@
-Subproject commit c3f63997abb75f1a94a11299a51fd8e106272ea3
+Subproject commit 072bbf7178b96a53d55116e35a71d22f665189c9