[exo-jcr-commits] exo-jcr SVN: r1508 - jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent.

[do-not-reply at jboss.org]

Author: pnedonosko
Date: 2010-01-20 09:49:26 -0500 (Wed, 20 Jan 2010)
New Revision: 1508

Modified:
   jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/TxIsolatedOperation.java
Log:
EXOJCR-410 don't throw RepositoryException on tx.commit() as it's only a cache commit and cache cannot fails the save

Modified: jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/TxIsolatedOperation.java
===================================================================
--- jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/TxIsolatedOperation.java	2010-01-20 14:09:11 UTC (rev 1507)
+++ jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/TxIsolatedOperation.java	2010-01-20 14:49:26 UTC (rev 1508)
@@ -98,40 +98,46 @@
             catch (RollbackException e)
             {
                // Indicate that the transaction has been rolled back rather than committed.
-               throw new RepositoryException(e);
+               // TODO throw new RepositoryException(e);
+               LOG.error("Transaction has been rolled back", e);
             }
             catch (HeuristicRollbackException e)
             {
                // if all relevant updates have been rolled back on commit
-               throw new RepositoryException(e);
+               // TODO throw new RepositoryException(e);
+               LOG.error("Relevant updates have been rolled back", e);
             }
             catch (HeuristicMixedException e)
             {
                // if some relevant updates have been committed and others have been rolled back on commit
                // TODO partial commit - got inconsistency. rollback not possible?
                // doRollback();
-               throw new RepositoryException(e);
+               // TODO throw new RepositoryException(e);
+               LOG.error("Some relevant updates have been committed and others have been rolled back", e);
             }
             catch (IllegalStateException e)
             {
                // if thread is not associated with a transaction
                // TODO can we do rollback if not in the tx thread?
                // doRollback();
-               throw new RepositoryException(e);
+               // TODO throw new RepositoryException(e);
+               LOG.error("Commit impossible, thread is not associated with a transaction", e);
             }
             catch (SecurityException e)
             {
                // if thread is not allowed to commit the transaction
                // TODO can we do the rollback, will it have a rights?
                // doRollback();               
-               throw new RepositoryException(e);
+               // TODO throw new RepositoryException(e);
+               LOG.error("Commit impossible, thread is not allowed to commit the transaction", e);
             }
             catch (SystemException e)
             {
                // if XA unexpected error
                // TODO rollback not possible?
                // doRollback();
-               throw new RepositoryException(e);
+               // TODO throw new RepositoryException(e);
+               LOG.error("Commit impossible dur to unexpected XA error", e);
             }
             finally
             {