1 files changed, 7 insertions, 2 deletions

diff --git a/frontend/beta/js/Clipperz/PM/Connection.js b/frontend/beta/js/Clipperz/PM/Connection.js
index 85aea21..e81c7a6 100644
--- a/frontend/beta/js/Clipperz/PM/Connection.js
+++ b/frontend/beta/js/Clipperz/PM/Connection.js
@@ -298,3 +298,6 @@ deferredResult.addErrback(MochiKit.Base.bind(function(res) {MochiKit.Logging.log
                                 this.user().setShouldDownloadOfflineCopy(someParameters['offlineCopyNeeded']);
-                                this.user().setLock(someParameters['lock']);
+
+                                if ((isReconnecting == true) && (this.user().lock() != someParameters['lock'])) {
+                                        throw Clipperz.PM.Connection.exception.StaleData;
+                                }
                         
@@ -303,2 +306,3 @@ deferredResult.addErrback(MochiKit.Base.bind(function(res) {MochiKit.Logging.log
                                 }
+
                                 result.addCallback(Clipperz.NotificationCenter.deferredNotification, this, 'updatedProgressState', 'connection_loggedIn');
@@ -579,3 +583,4 @@ Clipperz.PM.Connection.SRP['1.1'].prototype = MochiKit.Base.update(new Clipperz.
 Clipperz.PM.Connection.exception = {
-        WrongChecksum: new MochiKit.Base.NamedError("Clipperz.ByteArray.exception.InvalidValue")
+        WrongChecksum: new MochiKit.Base.NamedError("Clipperz.ByteArray.exception.InvalidValue"),
+        StaleData: new MochiKit.Base.NamedError("Stale data")
 };