Merge pull request #7923 from shivam71/MoveRefactoring_Fix

LSP Server: Adding Null Checks in MoveRefactoring code action
apache · Nov 7, 2024 · 7d89336 · 7d89336
2 parents 813ddb8 + 0bb6141
commit 7d89336
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/...java.lsp.server/src/org/netbeans/modules/java/lsp/server/refactoring/MoveRefactoring.java b/...java.lsp.server/src/org/netbeans/modules/java/lsp/server/refactoring/MoveRefactoring.java
@@ -420,6 +420,9 @@ void doRefactoring(MoveElementUI ui) {
         }
 
         private static Project getSelectedProject(NamedPath selectedProject) {
+            if (selectedProject == null) {
+                return null;
+            }
             try {
                 String path = selectedProject.getPath();
                 return path != null ? FileOwnerQuery.getOwner(Utils.fromUri(path)) : null;
@@ -429,6 +432,9 @@ private static Project getSelectedProject(NamedPath selectedProject) {
         }
 
         private static FileObject getSelectedRoot(NamedPath selectedRoot) {
+            if (selectedRoot == null) {
+                return null;
+            }
             try {
                 String path = selectedRoot.getPath();
                 return path != null ? Utils.fromUri(path) : null;