[exo-jcr-commits] exo-jcr SVN: r4438 - jcr/branches/1.12.x/patch/1.12.9-GA/JCR-1618.

[do-not-reply at jboss.org]

Author: tolusha
Date: 2011-05-27 07:07:52 -0400 (Fri, 27 May 2011)
New Revision: 4438

Modified:
   jcr/branches/1.12.x/patch/1.12.9-GA/JCR-1618/JCR-1618.patch
Log:
JCR-1618: patch updated

Modified: jcr/branches/1.12.x/patch/1.12.9-GA/JCR-1618/JCR-1618.patch
===================================================================
--- jcr/branches/1.12.x/patch/1.12.9-GA/JCR-1618/JCR-1618.patch	2011-05-27 11:03:32 UTC (rev 4437)
+++ jcr/branches/1.12.x/patch/1.12.9-GA/JCR-1618/JCR-1618.patch	2011-05-27 11:07:52 UTC (rev 4438)
@@ -1,6 +1,6 @@
 Index: exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/data-container.xml
 ===================================================================
---- exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/data-container.xml	(revision 4390)
+--- exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/data-container.xml	(revision 4300)
 +++ exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/data-container.xml	(working copy)
 @@ -96,18 +96,6 @@
        <programlisting>boolean isCheckSNSNewConnection();
@@ -23,7 +23,7 @@
        Configuration consists of implementation class and set of properties and
 Index: exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/configuration/jdbc-data-container-config.xml
 ===================================================================
---- exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/configuration/jdbc-data-container-config.xml	(revision 4390)
+--- exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/configuration/jdbc-data-container-config.xml	(revision 4300)
 +++ exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/configuration/jdbc-data-container-config.xml	(working copy)
 @@ -56,6 +56,13 @@
          </listitem>
@@ -41,7 +41,7 @@
      database dialect parameter. If you need a more detailed configuration of
 Index: exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCWorkspaceDataContainer.java
 ===================================================================
---- exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCWorkspaceDataContainer.java	(revision 4390)
+--- exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCWorkspaceDataContainer.java	(revision 4300)
 +++ exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCWorkspaceDataContainer.java	(working copy)
 @@ -370,7 +370,7 @@
        }
@@ -52,14 +52,16 @@
        }
  
        // ------------- Values swap config ------------------
-@@ -836,6 +836,22 @@
+@@ -836,6 +836,38 @@
      */
     public void start()
     {
 +      // if isolation level lesser then TRANSACTION_READ_COMMITTED, print a warning
++      Connection con = null;
 +      try
 +      {
-+         if (getConnectionFactory().getJdbcConnection().getTransactionIsolation() < Connection.TRANSACTION_READ_COMMITTED)
++         con = getConnectionFactory().getJdbcConnection();
++         if (con.getTransactionIsolation() < Connection.TRANSACTION_READ_COMMITTED)
 +         {
 +            LOG.warn("Wrong default isolation level, please set the default isolation level to READ_COMMITTED or higher. Other default isolation levels are not supported");
 +         }
@@ -72,6 +74,20 @@
 +      {
 +         LOG.error("Error checking isolation level configuration.", e);
 +      }
++      finally
++      {
++         if (con != null)
++         {
++            try
++            {
++               con.close();
++            }
++            catch (SQLException e)
++            {
++               // ignore me
++            }
++         }
++      }
     }
  
     /**