Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/FederationAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/Attic/FederationAction.java,v
diff -u -r1.1.2.5 -r1.1.2.6
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/FederationAction.java	3 Jul 2007 01:17:26 -0000	1.1.2.5
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/FederationAction.java	3 Jul 2007 02:23:24 -0000	1.1.2.6
@@ -64,8 +64,11 @@
 			}
 			if (name==null || name.trim().length()==0) {
 				errors.add("name", new ActionMessage("error.name.required"));
-			} else if (uservice.findByProperty(FederationServer.class, "name", name)!=null) {
-				errors.add("name", new ActionMessage("error.name.unique"));				
+			} else {
+				List existing = uservice.findByProperty(FederationServer.class, "name", name);
+				if (existing!=null && !existing.isEmpty()) {
+					errors.add("name", new ActionMessage("error.not.unique", name));
+				}
 			}
 			if (url==null || url.trim().length()==0) {
 				errors.add("url", new ActionMessage("error.url.required"));