Merge pull request #1384 from obiba/fix/unknown-session-in-async

MK-1280
obiba · Feb 6, 2017 · ccf100d · ccf100d
2 parents 13cf093 + bfc331b
commit ccf100d
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/mica-core/src/main/java/org/obiba/mica/file/service/FileSystemService.java b/mica-core/src/main/java/org/obiba/mica/file/service/FileSystemService.java
@@ -31,6 +31,7 @@
 import org.apache.commons.io.IOUtils;
 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.bson.types.ObjectId;
 import org.joda.time.DateTime;
@@ -916,9 +917,16 @@ private static String extractBaseName(String pathWithName) {
 
   private String getCurrentUsername() {
     Subject subject = SecurityUtils.getSubject();
-    return subject == null || subject.getPrincipal() == null
-        ? AbstractGitWriteCommand.DEFAULT_AUTHOR_NAME
-        : subject.getPrincipal().toString();
+
+    try {
+      if(subject != null && subject.getPrincipal() != null)
+        return subject.getPrincipal().toString();
+    } catch (UnknownSessionException ignore) {
+      log.debug(String.format(
+        "Impossible to get currentUsername, we are probably in an @Async method. Use DEFAULT_AUTHOR_NAME [%s]", AbstractGitWriteCommand.DEFAULT_AUTHOR_NAME), ignore);
+    }
+
+    return AbstractGitWriteCommand.DEFAULT_AUTHOR_NAME;
   }
 
   private void validateFileName(String name) {