[playframework#480]

ltullman · Mar 22, 2011 · 325dfe3 · 325dfe3
1 parent 7dc01de
commit 325dfe3
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/framework/src/play/data/binding/Binder.java b/framework/src/play/data/binding/Binder.java
@@ -399,16 +399,7 @@ public static Object directBind(String name, Annotation[] annotations, String va
             }
         }
 
-        // custom types
-        for (Class<?> c : supportedTypes.keySet()) {
-            Logger.trace("directBind: value [" + value + "] c [" + c + "] Class [" + clazz + "]");
-            if (c.isAssignableFrom(clazz)) {
-                Logger.trace("directBind: isAssignableFrom is true");
-                return supportedTypes.get(c).bind(name, annotations, value, clazz, type);
-            }
-        }
-
-        // application custom types
+        // application custom types have higher priority
         for (Class<TypeBinder<?>> c : Play.classloader.getAssignableClasses(TypeBinder.class)) {
             if (c.isAnnotationPresent(Global.class)) {
                 Class<?> forType = (Class) ((ParameterizedType) c.getGenericInterfaces()[0]).getActualTypeArguments()[0];
@@ -418,6 +409,15 @@ public static Object directBind(String name, Annotation[] annotations, String va
             }
         }
 
+         // custom types
+        for (Class<?> c : supportedTypes.keySet()) {
+            Logger.trace("directBind: value [" + value + "] c [" + c + "] Class [" + clazz + "]");
+            if (c.isAssignableFrom(clazz)) {
+                Logger.trace("directBind: isAssignableFrom is true");
+                return supportedTypes.get(c).bind(name, annotations, value, clazz, type);
+            }
+        }
+
         // raw String
         if (clazz.equals(String.class)) {
             return value;