Index: oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/SelectorImpl.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/SelectorImpl.java	(date 1413376989000)
+++ oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/SelectorImpl.java	(date 1413375890000)
@@ -581,11 +581,18 @@
                 }
                 return PropertyValues.newString(strings);
             }
+            Type<?> baseType = type.isArray() ? type.getBaseType() : type;
             @SuppressWarnings("unchecked")
-            PropertyBuilder<Object> builder = (PropertyBuilder<Object>) PropertyBuilder.array(type);
+            PropertyBuilder<Object> builder = (PropertyBuilder<Object>) PropertyBuilder.array(baseType);
             builder.setName("");
             for (PropertyValue v : list) {
+                if (type.isArray()) {
+                    for (Object value : (Iterable<?>) v.getValue(type)) {
+                        builder.addValue(value);
+                    }
+                } else {
-                builder.addValue(v.getValue(type));
+                    builder.addValue(v.getValue(type));
+                }
             }
             PropertyState s = builder.getPropertyState();
             return PropertyValues.create(s);
Index: oak-jcr/pom.xml
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- oak-jcr/pom.xml	(date 1413376989000)
+++ oak-jcr/pom.xml	(date 1413375890000)
@@ -145,8 +145,6 @@
       org.apache.jackrabbit.core.query.ShareableNodeTest#testName                                    <!-- OAK-118 -->
       org.apache.jackrabbit.core.query.ShareableNodeTest#testPathConstraint                          <!-- OAK-118 -->
       org.apache.jackrabbit.oak.jcr.query.QueryTest#fnNameEncoding                                   <!-- OAK-1000 -->
-
-      org.apache.jackrabbit.oak.jcr.ReferencesTest#testMultipleMultiReferences                       <!-- OAK-2197 -->
     </known.issues>
   </properties>
 
Index: oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/ReferencesTest.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/ReferencesTest.java	(date 1413376989000)
+++ oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/ReferencesTest.java	(date 1413375890000)
@@ -71,7 +71,6 @@
         checkReferences("refs", ref.getWeakReferences(), n.getPath() + "/myref");
     }
 
-    // FIXME OAK-2197
     public void testMultipleMultiReferences() throws RepositoryException {
         Node ref = testRootNode.addNode(nodeName2, testNodeType);
         ref.addMixin(mixReferenceable);