Ticket #776: usercreationfix.patch

File usercreationfix.patch, 0.9 kB (added by catullus, 7 months ago)

/openmrs/branches/data_synchronization_bidirectional/src/web/org/openmrs/web/controller/user/UserFormController.java

old	new
137	137	// the database, or else hibernate will throw a NonUniqueObjectException.
138	138	Role role = null;
139		for (Role test : user.getRoles())
140		if (test.getRole().equals(r))
141		role = test;
	139	if(user.getRoles() != null) {
	140	for (Role test : user.getRoles())
	141	if (test.getRole().equals(r))
	142	role = test;
	143	}
142	144	if (role == null) {
143	145	role = us.getRole(r);