projects
/
lgpl
/
argeo-commons.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Improve single user login.
[lgpl/argeo-commons.git]
/
org.argeo.maintenance
/
src
/
org
/
argeo
/
maintenance
/
AbstractMaintenanceService.java
diff --git
a/org.argeo.maintenance/src/org/argeo/maintenance/AbstractMaintenanceService.java
b/org.argeo.maintenance/src/org/argeo/maintenance/AbstractMaintenanceService.java
index c756bd8e048447bba544d725ca39f0e61972cad6..6003d638ddadab47a630d694903704ca62dce2c4 100644
(file)
--- a/
org.argeo.maintenance/src/org/argeo/maintenance/AbstractMaintenanceService.java
+++ b/
org.argeo.maintenance/src/org/argeo/maintenance/AbstractMaintenanceService.java
@@
-159,25
+159,27
@@
public abstract class AbstractMaintenanceService {
}
/** Add a user or group to a group. */
}
/** Add a user or group to a group. */
- protected void addToGroup(String
role
dDn, String groupDn) {
- if (
role
dDn.contentEquals(groupDn)) {
+ protected void addToGroup(String
groupToAd
dDn, String groupDn) {
+ if (
groupToAd
dDn.contentEquals(groupDn)) {
if (log.isTraceEnabled())
log.trace("Ignore adding group " + groupDn + " to itself");
return;
}
if (getUserAdmin() == null) {
if (log.isTraceEnabled())
log.trace("Ignore adding group " + groupDn + " to itself");
return;
}
if (getUserAdmin() == null) {
- log.warn("No user admin service available, cannot add group " +
role
dDn + " to " + groupDn);
+ log.warn("No user admin service available, cannot add group " +
groupToAd
dDn + " to " + groupDn);
return;
}
return;
}
- Group managerGroup = (Group) getUserAdmin().getRole(roledDn);
+ Group groupToAdd = (Group) getUserAdmin().getRole(groupToAddDn);
+ if (groupToAdd == null)
+ throw new IllegalArgumentException("Group " + groupToAddDn + " not found");
Group group = (Group) getUserAdmin().getRole(groupDn);
if (group == null)
throw new IllegalArgumentException("Group " + groupDn + " not found");
try {
getUserTransaction().begin();
Group group = (Group) getUserAdmin().getRole(groupDn);
if (group == null)
throw new IllegalArgumentException("Group " + groupDn + " not found");
try {
getUserTransaction().begin();
- if (group.addMember(
managerGroup
))
- log.info("Added " +
role
dDn + " to " + group);
+ if (group.addMember(
groupToAdd
))
+ log.info("Added " +
groupToAd
dDn + " to " + group);
getUserTransaction().commit();
} catch (Exception e) {
try {
getUserTransaction().commit();
} catch (Exception e) {
try {
@@
-185,7
+187,7
@@
public abstract class AbstractMaintenanceService {
} catch (Exception e1) {
// silent
}
} catch (Exception e1) {
// silent
}
- throw new IllegalStateException("Cannot add " +
managerGroup + " to " + group
);
+ throw new IllegalStateException("Cannot add " +
groupToAddDn + " to " + groupDn
);
}
}
}
}