Merge pull request #52 from JaneliaSciComp/JW-52979

porterbot · web-flow · commit e5fc24419c42 · 2025-05-20T12:39:02.000-04:00
fix null pointer; domainObject was not set before use in some cases
diff --git a/modules/ViewerController/src/main/java/org/janelia/workstation/controller/action/DeleteHortaWorkspaceAction.java b/modules/ViewerController/src/main/java/org/janelia/workstation/controller/action/DeleteHortaWorkspaceAction.java
@@ -53,10 +53,12 @@ public static DeleteHortaWorkspaceAction get() {
     @Override
     protected void processContext() {
         if (getNodeContext().isSingleObjectOfType(TmWorkspace.class)) {
+            domainObject = getNodeContext().getSingleObjectOfType(TmWorkspace.class);
             if (AccessManager.getAccessManager().isAdmin() ||
                     domainObject.getOwnerKey().equals(AccessManager.getSubjectKey())) {
-                domainObject = getNodeContext().getSingleObjectOfType(TmWorkspace.class);
                 setEnabledAndVisible(true);
+            } else {
+                setEnabledAndVisible(false);
             }
         }
         else {

Original file line number	Diff line number	Diff line change
`@@ -53,10 +53,12 @@ public static DeleteHortaWorkspaceAction get() {`
`53`	`53`	`@Override`
`54`	`54`	`protected void processContext() {`
`55`	`55`	`if (getNodeContext().isSingleObjectOfType(TmWorkspace.class)) {`
	`56`	`+ domainObject = getNodeContext().getSingleObjectOfType(TmWorkspace.class);`
`56`	`57`	`if (AccessManager.getAccessManager().isAdmin() \|\|`
`57`	`58`	`domainObject.getOwnerKey().equals(AccessManager.getSubjectKey())) {`
`58`		`- domainObject = getNodeContext().getSingleObjectOfType(TmWorkspace.class);`
`59`	`59`	`setEnabledAndVisible(true);`
	`60`	`+ } else {`
	`61`	`+ setEnabledAndVisible(false);`
`60`	`62`	`}`
`61`	`63`	`}`
`62`	`64`	`else {`