Skip to content

Commit ab85926

Browse files
committed
fixed NPE in a context menu.
1 parent 4e48b2c commit ab85926

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

src/main/java/com/ss/editor/ui/control/tree/node/TreeNode.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,8 +181,13 @@ public void fillContextMenu(@NotNull final NodeTree<?> nodeTree, @NotNull final
181181
if (canCopy()) items.add(new CopyNodeAction(nodeTree, this));
182182

183183
final Clipboard clipboard = Clipboard.getSystemClipboard();
184-
final Long objectId = (Long) clipboard.getContent(DATA_FORMAT);
185-
final TreeItem<?> treeItem = objectId == null ? null : UIUtils.findItem(nodeTree.getTreeView(), objectId);
184+
final Object content = clipboard.getContent(DATA_FORMAT);
185+
if (!(content instanceof Long)) {
186+
return;
187+
}
188+
189+
final Long objectId = (Long) content;
190+
final TreeItem<?> treeItem = UIUtils.findItem(nodeTree.getTreeView(), objectId);
186191
final TreeNode<?> treeNode = treeItem == null ? null : (TreeNode<?>) treeItem.getValue();
187192

188193
if (treeNode != null && canAccept(treeNode, true)) {

0 commit comments

Comments
 (0)