MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

EA-57004 - NPE: XBreakpointManagerImpl.createBreakpointDefaults

Browse Source
This commit is contained in:
Egor.Ushakov
2014-05-29 17:51:59 +04:00
parent 3b09eea14b
commit 98954e2ee6
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/XBreakpointManagerImpl.java
+14 -4
View File
@@ -417,7 +417,12 @@ public class XBreakpointManagerImpl implements XBreakpointManager, PersistentSta
for (BreakpointState defaults : state.getBreakpointsDefaults()) {
XBreakpointType<?,?> type = XBreakpointUtil.findType(defaults.getTypeId());
myBreakpointsDefaults.put(type, defaults);
if (type != null) {
myBreakpointsDefaults.put(type, defaults);
}
else {
LOG.warn("Unknown breakpoint type " + defaults.getTypeId());
}
}
myDependentBreakpointManager.loadState();
@@ -482,12 +487,16 @@ public class XBreakpointManagerImpl implements XBreakpointManager, PersistentSta
@Nullable
private XBreakpointBase<?,?,?> createBreakpoint(final BreakpointState breakpointState) {
XBreakpointType<?,?> type = XBreakpointUtil.findType(breakpointState.getTypeId());
if (type == null) return null;
if (type == null) {
LOG.warn("Unknown breakpoint type " + breakpointState.getTypeId());
return null;
}
//noinspection unchecked
return breakpointState.createBreakpoint(type, this);
}
public BreakpointState getBreakpointDefaults(XBreakpointType type) {
@NotNull
public BreakpointState getBreakpointDefaults(@NotNull XBreakpointType type) {
BreakpointState defaultState = myBreakpointsDefaults.get(type);
if (defaultState == null) {
defaultState = createBreakpointDefaults(type);
@@ -496,7 +505,8 @@ public class XBreakpointManagerImpl implements XBreakpointManager, PersistentSta
return defaultState;
}
private static BreakpointState createBreakpointDefaults(XBreakpointType type) {
@NotNull
private static BreakpointState createBreakpointDefaults(@NotNull XBreakpointType type) {
BreakpointState state = new BreakpointState();
state.setTypeId(type.getId());
return state;