SAK-26592 WebDAV dropbox access was very slow for schools that use an…

… external user provider because the Sakai internal user id was being set to the provider for every user directory. This reverses the lookup order to first try the cheap and easy lookup and then to try the expensive getUserByEid lookup if that fails

git-svn-id: https://source.sakaiproject.org/svn/dav/trunk@310478 66ffb92e-73f9-0310-93c1-f5514f145a0a

dav/dav/src/java/org/sakaiproject/dav/DavServlet.java

@@ -1998,19 +1998,20 @@ else if (idx.startsWith("/") && !idx.endsWith("/") && idx.length() > 2)
 		if(parts.length == 4 && parts[1].equals("group-user")){
 			try
 			{
-				// if successful, the context is already a valid user EID
-				UserDirectoryService.getUserByEid(parts[3]);
+				// try using it as an ID
+				resourceName = UserDirectoryService.getUserEid(parts[3]);
 			}
 			catch (UserNotDefinedException tryId)
 			{
 				try
 				{
-					// try using it as an ID
-					resourceName = UserDirectoryService.getUserEid(parts[3]);
+					// if successful, the context is already a valid user EID
+					UserDirectoryService.getUserByEid(parts[3]);
 				}
 				catch (UserNotDefinedException notId)
 				{
 					// if context was not a valid ID, leave it alone
+					M_log.warn("getResourceNameSAKAI could not find either id or eid: " + parts[3]);
 				}
 			}
 		 }