Ticket #2250: revert_last_unsign_changes.patch

src/main/java/org/sophie2/base/model/resources/r4/changes/MetaChange.java

@@ -272 +272 @@
                                 || (access.getHead().getPrevRevision() == null)) {
                         return null;
                 }
-
+                String viewId = access.getAccessOptions().getViewId();
+                ResourceRevision currentRev = access.getHead();
+                Change lastChange = currentRev.getLastChange();
+        
+                while (!lastChange.getViewId().equals(viewId)) {
+                        currentRev = currentRev.getPrevRevision();
+                        lastChange = currentRev.getLastChange();
+                        if (lastChange == null) {
+                                return null;
+                        }
+                }
+                if (!lastChange.isSignificant()) {
+                        return currentRev;
+                }
+                
                 List<RevisionId> skippedChanges = new ArrayList<RevisionId>();
-                ResourceRevision currentRev = access.getHead();
                 while (currentRev.getLastChange() != null) {
-                        if (((currentRev.getLastChange().getViewId().equals(
-                                        access.getAccessOptions().getViewId()) 
+                        if (((lastChange.getViewId().equals(viewId) 
                                         && !skippedChanges.contains(currentRev.getId()))) 
-                                        && !isUndo(currentRev.getLastChange())
-                                        && (currentRev.getLastChange().isSignificant())) {
+                                        && !isUndo(lastChange)
+                                        && (lastChange.isSignificant())) {
                                 return currentRev;
                         }
 
-                        if (currentRev.getLastChange() instanceof MetaChange 
+                        if (lastChange instanceof MetaChange 
                                         && !skippedChanges.contains(currentRev.getId())) {
-                                MetaChange metaChange = (MetaChange) currentRev.getLastChange();
+                                MetaChange metaChange = (MetaChange) lastChange;
                                 skippedChanges.addAll(metaChange.getRevisionsToSkip().asList());
                         }
                         currentRev = currentRev.getPrevRevision();
+                        lastChange = currentRev.getLastChange();
                 }
                 return null;
         }