# HG changeset patch
# User andrey.rusakov@oracle.com
# Date 1461249750 -10800
#      Thu Apr 21 17:42:30 2016 +0300
# Node ID c15f4e614591ea425976b1d2b45de2f6cf07e778
# Parent  8b584fe1865cbd2c7789249618c7b19c72c373e6
8134600: Can't pass ObservableList as argument using FXML
Summary: Check for java.util.Collection was performed before ProxyBuilder.ArrayListWrapper check.

diff --git a/modules/fxml/src/main/java/com/sun/javafx/fxml/builder/ProxyBuilder.java b/modules/fxml/src/main/java/com/sun/javafx/fxml/builder/ProxyBuilder.java
--- a/modules/fxml/src/main/java/com/sun/javafx/fxml/builder/ProxyBuilder.java
+++ b/modules/fxml/src/main/java/com/sun/javafx/fxml/builder/ProxyBuilder.java
@@ -447,10 +447,6 @@
             }
         }
 
-        if (Collection.class.isAssignableFrom(type)) {
-            return val;
-        }
-
         if (ArrayListWrapper.class.equals(val.getClass())) {
             // user given value is an ArrayList but the constructor doesn't
             // accept an ArrayList so the ArrayList comes from
@@ -460,6 +456,10 @@
             return l.get(0);
         }
 
+        if (Collection.class.isAssignableFrom(type)) {
+            return val;
+        }
+        
         return val;
     }