From df6f6f5c5ef2deb7928f79113929e24a398ba67b Mon Sep 17 00:00:00 2001 From: "Egor.Ushakov" Date: Fri, 28 Feb 2014 12:57:57 +0400 Subject: [PATCH] do not save empty condition and log message in breakpoints --- .../com/intellij/debugger/ui/breakpoints/Breakpoint.java | 7 ++++++- .../debugger/ui/breakpoints/FilteredRequestorImpl.java | 4 +--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/Breakpoint.java b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/Breakpoint.java index d846767b4b8a..90974d82ccc3 100644 --- a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/Breakpoint.java +++ b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/Breakpoint.java @@ -597,7 +597,12 @@ public abstract class Breakpoint

implements } protected void setLogMessage(TextWithImports logMessage) { - myXBreakpoint.setLogExpression(logMessage.getText()); + if (!logMessage.getText().isEmpty()) { + myXBreakpoint.setLogExpression(logMessage.getText()); + } + else { + myXBreakpoint.setLogExpression(null); + } } protected boolean isConditionEnabled() { diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/FilteredRequestorImpl.java b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/FilteredRequestorImpl.java index b83e0e97cb7e..2637773cb0cc 100644 --- a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/FilteredRequestorImpl.java +++ b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/FilteredRequestorImpl.java @@ -129,9 +129,7 @@ public class FilteredRequestorImpl implements JDOMExternalizable, FilteredReques breakpoint.setCountFilterEnabled(COUNT_FILTER_ENABLED); breakpoint.setCountFilter(COUNT_FILTER); - if (CONDITION_ENABLED) { - breakpoint.setCondition(myCondition != null ? myCondition.getText() : null); - } + breakpoint.setCondition(CONDITION_ENABLED && myCondition != null && !myCondition.getText().isEmpty() ? myCondition.getText() : null); breakpoint.setClassFiltersEnabled(CLASS_FILTERS_ENABLED); breakpoint.setClassFilters(getClassFilters());