From 41a29eba7ac14e531a92c4d6c493a71937ee0c39 Mon Sep 17 00:00:00 2001
From: hns <hannesw@gmail.com>
Date: Mon, 5 May 2003 16:54:18 +0000
Subject: [PATCH] Parenthesize filter constraint to prevent interaction with
 other query constraints.

---
 src/helma/objectmodel/db/Relation.java | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/helma/objectmodel/db/Relation.java b/src/helma/objectmodel/db/Relation.java
index 43fe2f10..aeea3db1 100644
--- a/src/helma/objectmodel/db/Relation.java
+++ b/src/helma/objectmodel/db/Relation.java
@@ -238,8 +238,13 @@ public final class Relation {
         // get additional filter property
         filter = props.getProperty(propName + ".filter");
 
-        if ((filter != null) && (filter.trim().length() == 0)) {
-            filter = null;
+        if (filter != null) {
+            if (filter.trim().length() == 0) {
+                filter = null;
+            } else {
+                // parenthesise filter
+                filter = "("+filter+")";
+            }
         }
 
         // get max size of collection