Author: nzamosenchuk
Date: 2011-08-23 05:05:53 -0400 (Tue, 23 Aug 2011)
New Revision: 4791
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/WorkspacePersistentDataManager.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCStorageConnection.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCWorkspaceDataContainer.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/GenericCQConnectionFactory.java
Log:
EXOJCR-1483 : applying patch.
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/WorkspacePersistentDataManager.java
===================================================================
---
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/WorkspacePersistentDataManager.java 2011-08-23
08:23:01 UTC (rev 4790)
+++
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/WorkspacePersistentDataManager.java 2011-08-23
09:05:53 UTC (rev 4791)
@@ -382,11 +382,11 @@
// reuse this connection as system
? systemDataContainer.reuseConnection(thisConnection)
// or open one new system
- : systemDataContainer.openConnection()
+ : systemDataContainer.openConnection(false)
// else if it's same container instances (system and this)
: thisConnection == null
// and non-system connection doens't exist - open it
- ? thisConnection = dataContainer.openConnection()
+ ? thisConnection = dataContainer.openConnection(false)
// if already open - use it
: thisConnection)
// system connection opened - use it
@@ -404,11 +404,11 @@
// reuse system connection as this
? dataContainer.reuseConnection(systemConnection)
// or open one new
- : dataContainer.openConnection()
+ : dataContainer.openConnection(false)
// else if it's same container instances (system and this)
: systemConnection == null
// and system connection doens't exist - open it
- ? systemConnection = dataContainer.openConnection()
+ ? systemConnection = dataContainer.openConnection(false)
// if already open - use it
: systemConnection)
// this connection opened - use it
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCStorageConnection.java
===================================================================
---
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCStorageConnection.java 2011-08-23
08:23:01 UTC (rev 4790)
+++
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCStorageConnection.java 2011-08-23
09:05:53 UTC (rev 4791)
@@ -242,7 +242,7 @@
// if conn.setAutoCommit(false) called twise or more times with value
// 'false'.
// TODO remove workaround for Sybase, jconn 6.05 Build 26564
- if (dbConnection.getAutoCommit())
+ if (!readOnly && dbConnection.getAutoCommit())
{
dbConnection.setAutoCommit(false);
}
@@ -347,7 +347,7 @@
{
closeStatements();
- if (!this.readOnly)
+ if (!readOnly)
{
dbConnection.rollback();
}
@@ -384,14 +384,8 @@
{
closeStatements();
- // If READ-ONLY status back it to READ-WRITE (we assume it was original state)
- if (readOnly)
+ if (!readOnly && dbConnection.getTransactionIsolation() >
Connection.TRANSACTION_READ_COMMITTED)
{
- dbConnection.setReadOnly(true);
- }
-
- if (dbConnection.getTransactionIsolation() >
Connection.TRANSACTION_READ_COMMITTED)
- {
dbConnection.rollback();
}
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCWorkspaceDataContainer.java
===================================================================
---
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCWorkspaceDataContainer.java 2011-08-23
08:23:01 UTC (rev 4790)
+++
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCWorkspaceDataContainer.java 2011-08-23
09:05:53 UTC (rev 4791)
@@ -835,12 +835,12 @@
new
SharedConnectionFactory(((JDBCStorageConnection)original).getJdbcConnection(),
containerName, multiDb,
valueStorageProvider, maxBufferSize, swapDirectory, swapCleaner);
- return STATISTICS_ENABLED ? new
StatisticsJDBCStorageConnection(cFactory.openConnection()) : cFactory
- .openConnection();
+ return STATISTICS_ENABLED ? new
StatisticsJDBCStorageConnection(cFactory.openConnection(false)) : cFactory
+ .openConnection(false);
}
else
{
- return openConnection();
+ return openConnection(false);
}
}
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/GenericCQConnectionFactory.java
===================================================================
---
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/GenericCQConnectionFactory.java 2011-08-23
08:23:01 UTC (rev 4790)
+++
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/GenericCQConnectionFactory.java 2011-08-23
09:05:53 UTC (rev 4791)
@@ -158,7 +158,7 @@
@Override
public WorkspaceStorageConnection openConnection() throws RepositoryException
{
- return openConnection(false);
+ return openConnection(true);
}
/**
@@ -197,12 +197,6 @@
Connection conn = dbDataSource != null ? dbDataSource.getConnection() :
(dbUserName != null ? DriverManager
.getConnection(dbUrl, dbUserName, dbPassword) :
DriverManager.getConnection(dbUrl));
- if (readOnly)
- {
- // set this feature only if it asked
- conn.setReadOnly(readOnly);
- }
-
return conn;
}
catch (SQLException e)
Show replies by date