Ticket #2363: switch-revision-notifications.patch

src/main/java/org/sophie2/base/model/resources/r4/access/MasterTopAccess.java

@@ -188 +188 @@
                 // TODO some checks for valid change, Security.
                 ResourceRevision newRevision = getHead().applyChange(change, revisionId);
                 if (!newRevision.equals(this.headRevision)) {
-                        switchToNextRevision(newRevision); 
+                        switchToRevision(newRevision); 
                 }
         }
 
@@ -197 +197 @@
          * 
          * @param newRevision The revision to switch to.
          */
-        protected void switchToNextRevision(ResourceRevision newRevision) {
+        protected void switchToRevision(ResourceRevision newRevision) {
                 assert newRevision != null;
-                assert this.headRevision.getId().compareTo(newRevision.getId()) < 0 : 
-                        "Cannot swith from rev " + this.headRevision.getId() + 
-                        " to " + newRevision.getId() + "!";
-
-                ResourceRevision oldRevision = this.headRevision;
+                if (this.headRevision.getId().equals(newRevision.getId())) {
+                        return;
+                }
+                ResourceRevision oldRevision = null;
+                ResourceRevision revision = null;
+                if( this.headRevision.getId().compareTo(newRevision.getId()) < 0) {
+                        oldRevision = this.headRevision;
+                        revision = newRevision;
+                } else {
+                        oldRevision = newRevision;
+                        revision = this.headRevision;
+                }
 
                 this.headRevision = newRevision;
                 this.headAspect.fireChanged(null);
 
-                ResourceRevision revision = newRevision;
                 while (oldRevision.getId().compareTo(revision.getId()) < 0) {
                         ChangeEffect effect = revision.getChangeEffect();
 

src/main/java/org/sophie2/base/connectivity/resources/MasterServerAccess.java

@@ -155 +155 @@
                         newRevision = newRevision.applyChange(change, revisionId);
                 }
                 
-                this.headRevision = revision; // TODO see how to notify properties
-                switchToNextRevision(newRevision); 
+                switchToRevision(revision);
+                switchToRevision(newRevision); 
                 this.syncInfo = this.syncInfo.setLastSyncRevision(newRevision.getId());
         }