The Unified and Autonomous Development Platform
Remove some possible NPEs
Robin Shen39292b1c99b9
diff --git a/server-core/src/main/java/io/onedev/server/util/GroovyUtils.java b/server-core/src/main/java/io/onedev/server/util/GroovyUtils.javaindex f83ca28cd4..0e8fb385f0 100644--- a/server-core/src/main/java/io/onedev/server/util/GroovyUtils.java+++ b/server-core/src/main/java/io/onedev/server/util/GroovyUtils.java@@ -60,8 +60,13 @@ public class GroovyUtils {public static Object evalScriptByName(String scriptName, Map<String, Object> variables) {for (GroovyScript script: OneDev.getInstance(SettingManager.class).getGroovyScripts()) {- if (script.getName().equals(scriptName) && script.isAuthorized(ScriptIdentity.get()))- return evalScript(StringUtils.join(script.getContent(), "\n"), variables);+ if (script.getName().equals(scriptName) && script.isAuthorized(ScriptIdentity.get())) {+ try {+ return evalScript(StringUtils.join(script.getContent(), "\n"), variables);+ } catch (Exception e) {+ throw new OneException("Error evaluating named groovy script: " + scriptName, e);+ }+ }}throw new OneException("No authorized groovy script found: " + scriptName);}diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/TextDiffPanel.java b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/TextDiffPanel.javaindex aeae1635cf..78c383b598 100644--- a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/TextDiffPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/TextDiffPanel.java@@ -326,7 +326,7 @@ public class TextDiffPanel extends Panel implements SourceAware {@Overrideprotected void respond(AjaxRequestTarget target) {IRequestParameters params = RequestCycle.get().getRequest().getPostParameters();- switch (params.getParameterValue("action").toString()) {+ switch (params.getParameterValue("action").toString("")) {case "expand":if (blameInfo != null) {blameInfo.lastCommitHash = null;diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.java b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.javaindex f0e1ce4116..7f9a57cb07 100644--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.java@@ -205,7 +205,7 @@ public class MarkdownEditor extends FormComponentPanel<String> {@Overrideprotected void respond(AjaxRequestTarget target) {IRequestParameters params = RequestCycle.get().getRequest().getPostParameters();- String action = params.getParameterValue("action").toString();+ String action = params.getParameterValue("action").toString("");switch (action) {case "render":String markdown = params.getParameterValue("param1").toString();diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.java b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.javaindex ff40ec01af..5c453b6cb4 100644--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.java+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.java@@ -129,7 +129,7 @@ public class MarkdownViewer extends GenericPanel<String> {@Overrideprotected void respond(AjaxRequestTarget target) {IRequestParameters params = RequestCycle.get().getRequest().getPostParameters();- String referenceType = params.getParameterValue(REFERENCE_TYPE).toString();+ String referenceType = params.getParameterValue(REFERENCE_TYPE).toString("");String referenceId = params.getParameterValue(REFERENCE_ID).toString();switch (referenceType) {case "issue":diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.javaindex c49ec5b24d..2a9deaf4bf 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java@@ -264,7 +264,7 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext, S@Overrideprotected void respond(AjaxRequestTarget target) {IRequestParameters params = RequestCycle.get().getRequest().getPostParameters();- String action = params.getParameterValue("action").toString();+ String action = params.getParameterValue("action").toString("");switch (action) {case "quickSearch":new ModalPanel(target) {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.javaindex 93667dc977..4c3a4df583 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java@@ -397,7 +397,7 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Sear@Overrideprotected void respond(AjaxRequestTarget target) {IRequestParameters params = RequestCycle.get().getRequest().getPostParameters();- switch(params.getParameterValue("action").toString()) {+ switch(params.getParameterValue("action").toString("")) {case "openSelectionPopover":PlanarRange mark = getMark(params, "param1", "param2", "param3", "param4");String unableCommentMessage = null;