Skip to content

The Unified and Autonomous Development Platform

Fix issue #1276 - Specific issues are not updating the UI after saving changes to issue fields, while other issues do

Robin Shene8bb77d5811d
diff --git a/server-core/src/main/java/io/onedev/server/event/DefaultListenerRegistry.java b/server-core/src/main/java/io/onedev/server/event/DefaultListenerRegistry.java
index fa866f62a3..7bad467944 100644
--- a/server-core/src/main/java/io/onedev/server/event/DefaultListenerRegistry.java
+++ b/server-core/src/main/java/io/onedev/server/event/DefaultListenerRegistry.java
@@ -12,6 +12,8 @@ import io.onedev.server.event.project.ProjectEvent;
import io.onedev.server.persistence.SessionManager;
import io.onedev.server.persistence.TransactionManager;
import io.onedev.server.persistence.annotation.Transactional;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.inject.Inject;
import javax.inject.Singleton;
@@ -25,6 +27,8 @@ import java.util.concurrent.ConcurrentHashMap;
@Singleton
public class DefaultListenerRegistry implements ListenerRegistry, Serializable {
+ private static final Logger logger = LoggerFactory.getLogger(DefaultListenerRegistry.class);
+
private final ProjectManager projectManager;
private final TransactionManager transactionManager;
@@ -120,34 +124,19 @@ public class DefaultListenerRegistry implements ListenerRegistry, Serializable {
private static final long serialVersionUID = 1L;
@Override
- public Void call() throws Exception {
- String lockName = projectEvent.getLockName();
- if (lockName != null) {
- LockUtils.call(lockName, true, new Callable<Void>() {
-
- @Override
- public Void call() throws Exception {
- sessionManager.run(new Runnable() {
-
- @Override
- public void run() {
- invokeListeners(event);
- }
-
- });
+ public Void call() {
+ try {
+ String lockName = projectEvent.getLockName();
+ if (lockName != null) {
+ LockUtils.call(lockName, true, (Callable<Void>) () -> {
+ sessionManager.run(() -> invokeListeners(event));
return null;
- }
-
- });
- } else {
- sessionManager.run(new Runnable() {
-
- @Override
- public void run() {
- invokeListeners(event);
- }
-
- });
+ });
+ } else {
+ sessionManager.run(() -> invokeListeners(event));
+ }
+ } catch (Exception e) {
+ logger.error("Error invoking listeners", e);
}
return null;
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/ChoiceFieldCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/ChoiceFieldCriteria.java
index 4bafa4c88c..3ecad17491 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/ChoiceFieldCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/ChoiceFieldCriteria.java
@@ -56,14 +56,18 @@ public class ChoiceFieldCriteria extends FieldCriteria {
@Override
public boolean matches(Issue issue) {
Object fieldValue = issue.getFieldValue(getFieldName());
- if (allowMultiple)
- return ((List<String>)fieldValue).contains(value);
- else if (operator == IssueQueryLexer.Is)
- return Objects.equals(fieldValue, value);
- else if (operator == IssueQueryLexer.IsGreaterThan)
- return issue.getFieldOrdinal(getFieldName(), (String)fieldValue) > ordinal;
- else
- return issue.getFieldOrdinal(getFieldName(), (String)fieldValue) < ordinal;
+ if (fieldValue != null) {
+ if (allowMultiple)
+ return ((List<String>) fieldValue).contains(value);
+ else if (operator == IssueQueryLexer.Is)
+ return Objects.equals(fieldValue, value);
+ else if (operator == IssueQueryLexer.IsGreaterThan)
+ return issue.getFieldOrdinal(getFieldName(), (String) fieldValue) > ordinal;
+ else
+ return issue.getFieldOrdinal(getFieldName(), (String) fieldValue) < ordinal;
+ } else {
+ return false;
+ }
}
@Override