summaryrefslogtreecommitdiff
path: root/qpid/cpp/src
diff options
context:
space:
mode:
Diffstat (limited to 'qpid/cpp/src')
-rw-r--r--qpid/cpp/src/qpid/broker/SelectorExpression.cpp7
1 files changed, 2 insertions, 5 deletions
diff --git a/qpid/cpp/src/qpid/broker/SelectorExpression.cpp b/qpid/cpp/src/qpid/broker/SelectorExpression.cpp
index 1e8a90ed4c..2884dd967a 100644
--- a/qpid/cpp/src/qpid/broker/SelectorExpression.cpp
+++ b/qpid/cpp/src/qpid/broker/SelectorExpression.cpp
@@ -369,13 +369,10 @@ public:
BoolOrNone eval_bool(const SelectorEnv& env) const {
Value ve(e->eval(env));
- if (unknown(ve)) return BN_UNKNOWN;
Value vl(l->eval(env));
- if (!unknown(vl) && ve<vl) return BN_FALSE;
Value vu(u->eval(env));
- if (!unknown(vu) && ve>vu) return BN_FALSE;
- if (unknown(vl) || unknown(vu)) return BN_UNKNOWN;
- return BN_TRUE;
+ if (unknown(ve) || unknown(vl) || unknown(vu)) return BN_UNKNOWN;
+ return BoolOrNone(ve>=vl && ve<=vu);
}
};