Merge pull request #1828 from AndrewKhitrin/fixlockmngr

Fix lock manager NPE

Merge pull request #1828 from AndrewKhitrin/fixlockmngr
Fix lock manager NPE
fc50f2ca · Serge Rider · GitHub · 7e1a9f67 · cb1e4018 · fc50f2ca
隐藏空白更改
内联并排

Showing with 6 addition and 4 deletion

plugins/org.jkiss.dbeaver.ext.ui.locks/src/org/jkiss/dbeaver/ext/ui/locks/manage/LockManagerViewer.java .../jkiss/dbeaver/ext/ui/locks/manage/LockManagerViewer.java +6 -4

未找到文件。
--- a/plugins/org.jkiss.dbeaver.ext.ui.locks/src/org/jkiss/dbeaver/ext/ui/locks/manage/LockManagerViewer.java
+++ b/plugins/org.jkiss.dbeaver.ext.ui.locks/src/org/jkiss/dbeaver/ext/ui/locks/manage/LockManagerViewer.java
@@ -69,10 +69,12 @@ public class LockManagerViewer {
    private Action killAction = new Action("Kill waiting session", UIUtils.getShardImageDescriptor(ISharedImages.IMG_ELCL_STOP)) {
        @Override
        public void run() {
-            DBAServerLock<?> root = graphManager.getGraph(curLock).getLockRoot();
+        	if (curLock != null) {
-            alterSession();
+                DBAServerLock<?> root = graphManager.getGraph(curLock).getLockRoot();
-            refreshLocks(root);
+                alterSession();
-            setTableLockSelect(root);
+                refreshLocks(root);
+                setTableLockSelect(root);        		
+        	}
        }
    };