[387564] Ensure lock notification sending after invalidation for "lock/unlock objects on commit"

https://bugs.eclipse.org/bugs/show_bug.cgi?id=387564

1 files changed, 22 insertions, 11 deletions

diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/DefaultLocksChangedEvent.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/DefaultLocksChangedEvent.java
index 99ba07f1c1..495d7a29f7 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/DefaultLocksChangedEvent.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/DefaultLocksChangedEvent.java
@@ -40,43 +40,54 @@ public class DefaultLocksChangedEvent extends Event implements CDOLockChangeInfo
     this.lockChangeInfo = lockChangeInfo;
   }
 
-  public InternalCDOView getSender()
+  public final InternalCDOView getSender()
   {
     return sender;
   }
 
-  public CDOBranch getBranch()
+  public final CDOBranch getBranch()
   {
     return lockChangeInfo.getBranch();
   }
 
-  public long getTimeStamp()
+  public final long getTimeStamp()
   {
     return lockChangeInfo.getTimeStamp();
   }
 
-  public CDOLockOwner getLockOwner()
+  public final Operation getOperation()
+  {
+    return lockChangeInfo.getOperation();
+  }
+
+  public final LockType getLockType()
+  {
+    return lockChangeInfo.getLockType();
+  }
+
+  public final CDOLockOwner getLockOwner()
   {
     return lockChangeInfo.getLockOwner();
   }
 
-  public CDOLockState[] getLockStates()
+  public final CDOLockState[] getLockStates()
   {
     return lockChangeInfo.getLockStates();
   }
 
-  public Operation getOperation()
+  public final boolean isInvalidateAll()
   {
-    return lockChangeInfo.getOperation();
+    return lockChangeInfo.isInvalidateAll();
   }
 
-  public LockType getLockType()
+  protected final CDOLockChangeInfo getLockChangeInfo()
   {
-    return lockChangeInfo.getLockType();
+    return lockChangeInfo;
   }
 
-  public boolean isInvalidateAll()
+  @Override
+  protected String formatAdditionalParameters()
   {
-    return lockChangeInfo.isInvalidateAll();
+    return "sender=" + getSender() + ", " + getLockChangeInfo();
   }
 }