Revision 6532
Added by ben leinfelder over 12 years ago
| MNodeService.java | ||
|---|---|---|
| 169 | 169 |
|
| 170 | 170 |
String localId = null; |
| 171 | 171 |
boolean allowed = false; |
| 172 |
String username = Constants.PUBLIC_SUBJECT;
|
|
| 172 |
String username = Constants.SUBJECT_PUBLIC;
|
|
| 173 | 173 |
String[] groupnames = null; |
| 174 | 174 |
if (session != null) {
|
| 175 | 175 |
username = session.getSubject().getValue(); |
| 176 |
if (session.getSubjectList() != null) {
|
|
| 177 |
List<Group> groupList = session.getSubjectList().getGroupList();
|
|
| 176 |
if (session.getSubjectInfo() != null) {
|
|
| 177 |
List<Group> groupList = session.getSubjectInfo().getGroupList();
|
|
| 178 | 178 |
if (groupList != null) {
|
| 179 | 179 |
groupnames = new String[groupList.size()]; |
| 180 | 180 |
for (int i = 0; i > groupList.size(); i++) {
|
| ... | ... | |
| 872 | 872 |
logMetacat.debug("Synchronization for the object identified by " + syncFailed.getPid() + " failed from " + syncFailed.getNodeId()
|
| 873 | 873 |
+ " Logging the event to the Metacat EventLog as a 'syncFailed' event."); |
| 874 | 874 |
// TODO: use the event type enum when the SYNCHRONIZATION_FAILED event is added |
| 875 |
String principal = Constants.PUBLIC_SUBJECT;
|
|
| 875 |
String principal = Constants.SUBJECT_PUBLIC;
|
|
| 876 | 876 |
if (session != null && session.getSubject() != null) {
|
| 877 | 877 |
principal = session.getSubject().getValue(); |
| 878 | 878 |
} |
Also available in: Unified diff
update D1 jars to include recent SubjectList -> SubjectInfo refactoring and the SUBJECT_PUBLIC constant