summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2007-10-20 03:28:37 (EDT)
committerEike Stepper2007-10-20 03:28:37 (EDT)
commitce2b849a1907d57c8aeffcae86f5c3ecc05226d8 (patch)
tree2a4e96a52bc7b67abf163ba1fc1c46eaf4aefeff
parente666d390714aa94f2706a963f8f1d3b932c88e5c (diff)
downloadcdo-ce2b849a1907d57c8aeffcae86f5c3ecc05226d8.zip
cdo-ce2b849a1907d57c8aeffcae86f5c3ecc05226d8.tar.gz
cdo-ce2b849a1907d57c8aeffcae86f5c3ecc05226d8.tar.bz2
Logging of rollbackMessage
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CommitTransactionIndication.java3
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CommitTransactionRequest.java1
2 files changed, 3 insertions, 1 deletions
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CommitTransactionIndication.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CommitTransactionIndication.java
index a33365f..911d599 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CommitTransactionIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CommitTransactionIndication.java
@@ -109,8 +109,8 @@ public class CommitTransactionIndication extends CDOServerIndication
newResources = readNewResources(in, storeWriter);
newObjects = readNewObjects(in, storeWriter);
dirtyObjects = readDirtyObjects(in, storeWriter);
-
ITransaction<IStoreWriter> storeTransaction = new Transaction<IStoreWriter>(storeWriter, false);
+
try
{
addPackages(storeTransaction, newPackages);
@@ -121,6 +121,7 @@ public class CommitTransactionIndication extends CDOServerIndication
}
catch (RuntimeException ex)
{
+ OM.LOG.error(ex);
rollbackMessage = ex.getLocalizedMessage();
storeWriter.rollback(view, storeTransaction);
}
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CommitTransactionRequest.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CommitTransactionRequest.java
index 1a48f1f..5381d3b 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CommitTransactionRequest.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CommitTransactionRequest.java
@@ -74,6 +74,7 @@ public class CommitTransactionRequest extends CDOClientRequest<CommitTransaction
if (!success)
{
String rollbackMessage = in.readString();
+ OM.LOG.error(rollbackMessage);
return new CommitTransactionResult(rollbackMessage);
}