Merge 11bbec4 into 92667ca

crate · Nov 11, 2014 · 5eaad98 · 5eaad98
2 parents 92667ca + 11bbec4
commit 5eaad98
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -5,6 +5,9 @@ Changes for Crate
 Unreleased
 ==========
 
+ - Fixed a rare race condition that could cause the ``having`` clause to filter
+   incorrectly.
+
  - Fix: ``alter table add column`` didn't work correctly on partitioned tables.
 
  - Added cast function for timestamp type

diff --git a/sql/src/main/java/io/crate/operation/projectors/FilterProjector.java b/sql/src/main/java/io/crate/operation/projectors/FilterProjector.java
@@ -51,7 +51,7 @@ public void startProjection() {
     }
 
     @Override
-    public boolean setNextRow(Object... row) {
+    public synchronized boolean setNextRow(Object... row) {
         for (CollectExpression<?> collectExpression : collectExpressions) {
             collectExpression.setNextRow(row);
         }