Incorrect SQL with OR and IS NOT EMPTY

SourceForge Submitter: jboynes .
Opening this as 621270 has been closed.

Incorrect SQL is generated for EJB-QL where IS NOT
EMPTY is used in a OR condition such as:
SELECT OBJECT(p)
FROM parent p
WHERE p.children IS NOT EMPTY
OR p.value = ?1

generates

SELECT t0_p.id
FROM Parent t0_p, Child t1_p_children
WHERE ((1=1) OR t0_p.value = ?) – <---- oops
AND (t0_p.id=t1_p_children.parent)