Merge branch 's1890' of gimli2:/srv/cadc/git/ac into s1890 (60c3ecde) · Commits · OATS-CADC / ac

cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/UserServlet.java

+16 −11

Original line number	Original line	Diff line number	Diff line
	@@ -126,7 +126,6 @@ public class UserServlet extends HttpServlet
	{		{
	x500List = x500Users.split(" ");		x500List = x500Users.split(" ");
	httpList = httpUsers.split(" ");		httpList = httpUsers.split(" ");
	}

	if (x500List.length != httpList.length)		if (x500List.length != httpList.length)
	{		{
	@@ -142,6 +141,12 @@ public class UserServlet extends HttpServlet
	privilegedSubjects.add(s);		privilegedSubjects.add(s);
	}		}

			}
			else
			{
			log.warn("No Privileged users configured.");
			}

	PluginFactory pluginFactory = new PluginFactory();		PluginFactory pluginFactory = new PluginFactory();
	userPersistence = pluginFactory.createUserPersistence();		userPersistence = pluginFactory.createUserPersistence();
	}		}