diff options
| author | Eike Stepper | 2016-10-05 05:33:22 +0000 |
|---|---|---|
| committer | Eike Stepper | 2016-10-05 05:33:22 +0000 |
| commit | 95d11d623b78209da114873fe169995fee7af59c (patch) | |
| tree | 7f214e0b0a42ef63cd22cf83d167b30f3277ed98 /plugins/org.eclipse.emf.cdo.server.objectivity/src/org | |
| parent | 023a17a1a415b2c6272ff1a81f54c0b6f7b4e51a (diff) | |
| download | cdo-95d11d623b78209da114873fe169995fee7af59c.tar.gz cdo-95d11d623b78209da114873fe169995fee7af59c.tar.xz cdo-95d11d623b78209da114873fe169995fee7af59c.zip | |
[504014] Make merge information available in CDOCommitInfo
https://bugs.eclipse.org/bugs/show_bug.cgi?id=504014
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.server.objectivity/src/org')
| -rw-r--r-- | plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/ObjectivityStoreAccessor.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/ObjectivityStoreAccessor.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/ObjectivityStoreAccessor.java index 03197ff179..eb9e2c9695 100644 --- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/ObjectivityStoreAccessor.java +++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/ObjectivityStoreAccessor.java @@ -291,7 +291,7 @@ public class ObjectivityStoreAccessor extends StoreAccessor implements IObjectiv if (TRACER_DEBUG.isEnabled()) { TRACER_DEBUG - .trace("getObjySession() - context's transaction: " + (cdoTrx == null ? "null" : cdoTrx.toString())); + .trace("getObjySession() - context's transaction: " + (cdoTrx == null ? "null" : cdoTrx.toString())); } if (cdoTrx != null) { @@ -741,7 +741,7 @@ public class ObjectivityStoreAccessor extends StoreAccessor implements IObjectiv if (TRACER_DEBUG.isEnabled()) { TRACER_DEBUG - .trace(" writeRevisions: " + revisions.length + " - time: " + (System.nanoTime() - start) / 1000000.0); + .trace(" writeRevisions: " + revisions.length + " - time: " + (System.nanoTime() - start) / 1000000.0); // TRACER_DEBUG.trace(" getObjectTime: " + ObjyObjectManager.getObjectTime / 1000000.0); // TRACER_DEBUG.trace(" updateObjectTime: " + ObjyObjectManager.updateObjectTime / 1000000.0); // TRACER_DEBUG.trace(" resourceCheckAndUpdateTime: " + ObjyObjectManager.resourceCheckAndUpdateTime / @@ -1612,12 +1612,13 @@ public class ObjectivityStoreAccessor extends StoreAccessor implements IObjectiv } CDOCommitInfo commitInfo = commitInfoManager.createCommitInfo(infoBranch, timeStamp, previousTimeStamp, userID, - comment, null); + comment, null, null); handler.handleCommitInfo(commitInfo); } } + @SuppressWarnings("deprecation") @Override protected void writeCommitInfo(CDOBranch branch, long timeStamp, long previousTimeStamp, String userID, String comment, OMMonitor monitor) |