X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fuk%2Fac%2Fvamsas%2Fclient%2Fsimpleclient%2FVamsasSession.java;h=87e904a8b890457786492d32020c506671a0a8bd;hb=dd0190e5fa9f955180ba7a00482829ec51c24ebc;hp=a000f465c30855fc544231c8451dbe510dd9a214;hpb=f107db87425f86dd4fed8846d0ac09dc31d1ac46;p=vamsas.git

diff --git a/src/uk/ac/vamsas/client/simpleclient/VamsasSession.java b/src/uk/ac/vamsas/client/simpleclient/VamsasSession.java
index a000f46..87e904a 100644
--- a/src/uk/ac/vamsas/client/simpleclient/VamsasSession.java
+++ b/src/uk/ac/vamsas/client/simpleclient/VamsasSession.java
@@ -611,10 +611,15 @@ public class VamsasSession {
     client.evgen._raise(Events.DOCUMENT_FINALIZEAPPDATA, null, client, null);
     boolean closeSession = isLastActiveClient(client);
     if (closeSession) {
-      log.debug("Raising request-to-save event");
-      client.evgen._raise(Events.DOCUMENT_REQUESTTOCLOSE, null, client, null);
+      if (client.get_session().getUnsavedFlag())
+      {
+        log.debug("Raising request-to-save event");
+        client.evgen._raise(Events.DOCUMENT_REQUESTTOCLOSE, null, client, null);
+      }
+      log.debug("Raising session shutdown event");
       client.evgen._raise(Events.SESSION_SHUTDOWN, null, client
           .getSessionHandle(), null);
+      log.debug("All events raised for finalising session "+client.getSessionHandle().toString());
     }
     // cwe.haltWatch();
     client.evgen.stopWatching();
@@ -791,7 +796,7 @@ public class VamsasSession {
           // {//no client has registered as active
           if (islastClient) {
             // the client is the last one, so close current session
-            log.info("last client removed: closing session");
+            log.info("FROMCLIENTLIST WATCHER: last client removed: closing session");
             closeSession(client);
           }
         } else {