Patch for MoveRefactoring null error fix

oracle · Oct 30, 2024 · 6d12f01 · 6d12f01
1 parent f50358c
commit 6d12f01
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 0 deletions.
diff --git a/build.xml b/build.xml
@@ -58,6 +58,7 @@
             patches/7750.diff
             patches/7910.diff
             patches/7921.diff
+            patches/7923_draft.diff
             patches/mvn-sh.diff
             patches/generate-dependencies.diff
             patches/rename-debugger.diff

diff --git a/patches/7923_draft.diff b/patches/7923_draft.diff
@@ -0,0 +1,22 @@
+diff --git a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/refactoring/MoveRefactoring.java b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/refactoring/MoveRefactoring.java
+index a72abd44ef..199ffad108 100644
+--- a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/refactoring/MoveRefactoring.java
++++ b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/refactoring/MoveRefactoring.java
+@@ -423,7 +423,7 @@ public final class MoveRefactoring extends CodeRefactoring {
+             try {
+                 String path = selectedProject.getPath();
+                 return path != null ? FileOwnerQuery.getOwner(Utils.fromUri(path)) : null;
+-            } catch (MalformedURLException ex) {
++            } catch (MalformedURLException | NullPointerException ex) {
+                 return null;
+             }
+         }
+@@ -432,7 +432,7 @@ public final class MoveRefactoring extends CodeRefactoring {
+             try {
+                 String path = selectedRoot.getPath();
+                 return path != null ? Utils.fromUri(path) : null;
+-            } catch (MalformedURLException ex) {
++            } catch (MalformedURLException | NullPointerException ex) {
+                 return null;
+             }
+         }