Merge pull request #1362 from obiba/fix/indexation

MLSTRM-441

Author: ymarcon

mica-core/src/main/java/org/obiba/mica/core/service/AbstractGitPersistableService.java

@@ -26,6 +26,7 @@
 import com.google.common.collect.Lists;
 import org.apache.commons.math3.util.Pair;
 import org.apache.shiro.SecurityUtils;
+import org.apache.shiro.session.UnknownSessionException;
 import org.apache.shiro.subject.Subject;
 import org.joda.time.DateTime;
 import org.obiba.git.CommitInfo;
@@ -194,8 +195,15 @@ public T updateStatus(String id, RevisionStatus status) {
 
   protected String getCurrentUsername() {
     Subject subject = SecurityUtils.getSubject();
-    return subject == null || subject.getPrincipal() == null
-      ? AbstractGitWriteCommand.DEFAULT_AUTHOR_NAME
-      : subject.getPrincipal().toString();
+    return extractAuthorName(subject, AbstractGitWriteCommand.DEFAULT_AUTHOR_NAME);
+  }
+
+  private String extractAuthorName(Subject subject, String defaultName) {
+    try {
+      if (subject != null && subject.getPrincipal() != null)
+        return subject.getPrincipal().toString();
+    } catch (UnknownSessionException ignore) {
+    }
+    return defaultName;
   }
 }