Index: oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexTest.java
===================================================================
--- oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexTest.java	(revision 1485721)
+++ oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexTest.java	(working copy)
@@ -44,6 +44,7 @@
 import org.apache.jackrabbit.oak.spi.query.PropertyValues;
 import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
 import org.apache.jackrabbit.oak.spi.state.NodeState;
+import org.junit.Ignore;
 import org.junit.Test;
 
 import com.google.common.collect.ImmutableSet;
@@ -339,4 +340,22 @@
         assertNull(unexpected);
     }
 
+    @Ignore("OAK-841")
+    @Test
+    public void emptyStringValue() throws CommitFailedException {
+        NodeState root = EMPTY_NODE;
+
+        // Add index definition
+        NodeBuilder builder = root.builder();
+        createIndexDefinition(builder.child(INDEX_DEFINITIONS_NAME), "prop",
+                true, false, ImmutableSet.of("prop"), null);
+        NodeState before = builder.getNodeState();
+
+        builder.child("node-1").setProperty("prop", "value");
+        builder.child("node-2").setProperty("prop", "");
+        NodeState after = builder.getNodeState();
+
+        EditorDiff.process(new PropertyIndexEditor(builder), before, after);
+    }
+
 }