fixed NPE

This commit is contained in:
nik
2011-02-22 12:10:49 +03:00
parent a060107f89
commit 005c5e2df2
@@ -62,7 +62,9 @@ public class MasterDetailsStateService implements PersistentStateComponent<Maste
@Nullable
public MasterDetailsState getComponentState(@NotNull @NonNls String key, Class<? extends MasterDetailsState> stateClass) {
ComponentState state = myStates.get(key);
return state != null ? XmlSerializer.deserialize(state.mySettings, stateClass) : null;
if (state == null) return null;
final Element settings = state.mySettings;
return settings != null ? XmlSerializer.deserialize(settings, stateClass) : null;
}
public void setComponentState(@NotNull @NonNls String key, @NotNull MasterDetailsState state) {