modules/fxml/src/main/java/com/sun/javafx/fxml/builder/ProxyBuilder.java

rev 9287 : 8134600: Can't pass ObservableList as argument using FXML
Summary: Check for java.util.Collection was performed before ProxyBuilder.ArrayListWrapper check.

*** 445,467 ****
                  // conversion failed, maybe the ArrayListWrapper is
                  // used for storing single value
              }
          }
  
-         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
              // the getTemporaryContainer method
              // we take the first argument
              List l = (List) val;
              return l.get(0);
          }
  
          return val;
      }
  
      private Object createObjectWithExactArguments(Constructor c, Set<String> argumentNames) {
          Object retObj = null;
--- 445,467 ----
                  // conversion failed, maybe the ArrayListWrapper is
                  // used for storing single value
              }
          }
  
          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
              // the getTemporaryContainer method
              // we take the first argument
              List l = (List) val;
              return l.get(0);
          }
  
+         if (Collection.class.isAssignableFrom(type)) {
+             return val;
+         }
+         
          return val;
      }
  
      private Object createObjectWithExactArguments(Constructor c, Set<String> argumentNames) {
          Object retObj = null;