diff options
| author | Tor Norbye <tnorbye@google.com> | 2014-08-19 15:25:05 -0700 |
|---|---|---|
| committer | Tor Norbye <tnorbye@google.com> | 2014-08-19 15:25:05 -0700 |
| commit | 060e58b3afea3ea39f5ba1cb5a443ca3ebda28c8 (patch) | |
| tree | dfc17b31990e2429535609b85f6d080c4fa0d9fe /platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/BreakpointState.java | |
| parent | 890d9a2952301682ffecaed4495f5f65c84c3642 (diff) | |
| parent | 02cf98d65c798d368fcec43ed64a001d513bdd4f (diff) | |
| download | idea-060e58b3afea3ea39f5ba1cb5a443ca3ebda28c8.tar.gz | |
Merge remote-tracking branch 'aosp/upstream-master' into merge
Conflicts:
.idea/modules.xml
build/scripts/tests.gant
Change-Id: I9a1fe25b61f1004e0f62419a5f64e1452644b784
Diffstat (limited to 'platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/BreakpointState.java')
| -rw-r--r-- | platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/BreakpointState.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/BreakpointState.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/BreakpointState.java index 364353c2ac63..8631b8fc901b 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/BreakpointState.java +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/BreakpointState.java @@ -156,11 +156,11 @@ public class BreakpointState<B extends XBreakpoint<P>, P extends XBreakpointProp } public boolean isLogExpressionEnabled() { - return myLogExpression != null && !myLogExpression.myDisabled; + return myLogExpression == null || !myLogExpression.myDisabled; } public boolean isConditionEnabled() { - return myCondition != null && !myCondition.myDisabled; + return myCondition == null || !myCondition.myDisabled; } @Property(surroundWithTag = false) |