exo-jcr SVN: r1718 - kernel/trunk.
by do-not-reply＠jboss.org
Author: dkatayev
Date: 2010-02-08 09:04:27 -0500 (Mon, 08 Feb 2010)
New Revision: 1718
Modified:
kernel/trunk/pom.xml
Log:
EXOJCR-454 foundation-parent updated to 4-SNAPSHOT version
Modified: kernel/trunk/pom.xml
===================================================================
--- kernel/trunk/pom.xml 2010-02-08 14:03:36 UTC (rev 1717)
+++ kernel/trunk/pom.xml 2010-02-08 14:04:27 UTC (rev 1718)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform</groupId>
<artifactId>foundation-parent</artifactId>
- <version>3</version>
+ <version>4-SNAPSHOT</version>
</parent>
<groupId>org.exoplatform.kernel</groupId>
14 years, 8 months
exo-jcr SVN: r1717 - junit.framework/trunk.
by do-not-reply＠jboss.org
Author: dkatayev
Date: 2010-02-08 09:03:36 -0500 (Mon, 08 Feb 2010)
New Revision: 1717
Modified:
junit.framework/trunk/pom.xml
Log:
EXOJCR-454 foundation-parent updated to 4-SNAPSHOT version
Modified: junit.framework/trunk/pom.xml
===================================================================
--- junit.framework/trunk/pom.xml 2010-02-08 13:58:21 UTC (rev 1716)
+++ junit.framework/trunk/pom.xml 2010-02-08 14:03:36 UTC (rev 1717)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform</groupId>
<artifactId>foundation-parent</artifactId>
- <version>3</version>
+ <version>4-SNAPSHOT</version>
</parent>
<groupId>org.exoplatform.tool</groupId>
14 years, 8 months
exo-jcr SVN: r1716 - jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/cluster/load/query.
by do-not-reply＠jboss.org
Author: skabashnyuk
Date: 2010-02-08 08:58:21 -0500 (Mon, 08 Feb 2010)
New Revision: 1716
Modified:
jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/cluster/load/query/JcrQueryAvgResponceTimeTest.java
Log:
EXOJCR-395 : change test root creation
Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/cluster/load/query/JcrQueryAvgResponceTimeTest.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/cluster/load/query/JcrQueryAvgResponceTimeTest.java 2010-02-08 13:52:03 UTC (rev 1715)
+++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/cluster/load/query/JcrQueryAvgResponceTimeTest.java 2010-02-08 13:58:21 UTC (rev 1716)
@@ -269,7 +269,7 @@
CredentialsImpl credentials = new CredentialsImpl("admin", "admin".toCharArray());
sessionLocal = repository.login(credentials, "ws");
long start = System.currentTimeMillis();
- Node threadNode = sessionLocal.getRootNode().getNode("Thread" + threadUUID);
+ Node threadNode = getOrCreateNode(sessionLocal.getRootNode(), threadUUID);
addCountent(threadNode, UUID.randomUUID(), word);
sessionLocal.save();
result.add(new WorkerResult(false, System.currentTimeMillis() - start));
14 years, 8 months
exo-jcr SVN: r1715 - jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/cluster/load/query.
by do-not-reply＠jboss.org
Author: skabashnyuk
Date: 2010-02-08 08:52:03 -0500 (Mon, 08 Feb 2010)
New Revision: 1715
Modified:
jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/cluster/load/query/JcrQueryAvgResponceTimeTest.java
Log:
EXOJCR-395 : change test root creation
Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/cluster/load/query/JcrQueryAvgResponceTimeTest.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/cluster/load/query/JcrQueryAvgResponceTimeTest.java 2010-02-08 13:26:28 UTC (rev 1714)
+++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/cluster/load/query/JcrQueryAvgResponceTimeTest.java 2010-02-08 13:52:03 UTC (rev 1715)
@@ -25,6 +25,7 @@
import org.exoplatform.services.jcr.cluster.load.WorkerResult;
import org.exoplatform.services.jcr.core.CredentialsImpl;
import org.exoplatform.services.jcr.impl.core.RepositoryImpl;
+import org.jboss.cache.CacheException;
import java.util.ArrayList;
import java.util.List;
@@ -171,17 +172,21 @@
sessionLocal = repository.login(credentials, "ws");
// prepare nodes
Node wsRoot = sessionLocal.getRootNode();
- Node threadNode = wsRoot.addNode("Thread" + threadUUID);
+ Node threadNode = getOrCreateNode(wsRoot, threadUUID);
sessionLocal.save();
sessionLocal.logout();
sessionLocal = null;
isSuccessful = true;
}
- catch (Exception e)
+ catch (CacheException e)
{
log.error("error on creating root attempt " + i + " from " + maxAttempts);
//ignore
}
+ catch (RepositoryException e)
+ {
+ log.error("error on creating root attempt " + i + " from " + maxAttempts);
+ }
finally
{
if (sessionLocal != null)
@@ -198,6 +203,10 @@
}
}
}
+ if (isSuccessful)
+ {
+ break;
+ }
}
}
@@ -295,13 +304,19 @@
private void addCountent(Node testRoot, UUID nodePath, String content) throws RepositoryException
{
+ Node l5 = getOrCreateNode(testRoot, nodePath);
+ l5.setProperty(FIELDNAME_CONTENT, content);
+ }
+
+ private Node getOrCreateNode(Node testRoot, UUID nodePath) throws RepositoryException
+ {
String uuidPath = nodePath.toString();
Node l1 = addOrCreate(uuidPath.substring(0, 8), testRoot);
Node l2 = addOrCreate(uuidPath.substring(9, 13), l1);
Node l3 = addOrCreate(uuidPath.substring(14, 18), l2);
Node l4 = addOrCreate(uuidPath.substring(19, 23), l3);
- Node l5 = addOrCreate(uuidPath.substring(24), l4);
- l5.setProperty(FIELDNAME_CONTENT, content);
+ return addOrCreate(uuidPath.substring(24), l4);
+
}
/**
14 years, 8 months
exo-jcr SVN: r1714 - jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/cluster/load/query.
by do-not-reply＠jboss.org
Author: skabashnyuk
Date: 2010-02-08 08:26:28 -0500 (Mon, 08 Feb 2010)
New Revision: 1714
Modified:
jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/cluster/load/query/JcrQueryAvgResponceTimeTest.java
Log:
EXOJCR-395 : load test update
Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/cluster/load/query/JcrQueryAvgResponceTimeTest.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/cluster/load/query/JcrQueryAvgResponceTimeTest.java 2010-02-08 10:31:50 UTC (rev 1713)
+++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/cluster/load/query/JcrQueryAvgResponceTimeTest.java 2010-02-08 13:26:28 UTC (rev 1714)
@@ -159,22 +159,46 @@
*/
private void initRoot()
{
- try
+ int maxAttempts = 10;
+ CredentialsImpl credentials = new CredentialsImpl("admin", "admin".toCharArray());
+ for (int i = 0; i < maxAttempts; i++)
{
- CredentialsImpl credentials = new CredentialsImpl("admin", "admin".toCharArray());
- Session sessionLocal = repository.login(credentials, "ws");
- // prepare nodes
- Node wsRoot = sessionLocal.getRootNode();
- Node threadNode = wsRoot.addNode("Thread" + threadUUID);
- sessionLocal.save();
- sessionLocal.logout();
- sessionLocal = null;
+ boolean isSuccessful = false;
+ Session sessionLocal = null;
+ try
+ {
+
+ sessionLocal = repository.login(credentials, "ws");
+ // prepare nodes
+ Node wsRoot = sessionLocal.getRootNode();
+ Node threadNode = wsRoot.addNode("Thread" + threadUUID);
+ sessionLocal.save();
+ sessionLocal.logout();
+ sessionLocal = null;
+ isSuccessful = true;
+ }
+ catch (Exception e)
+ {
+ log.error("error on creating root attempt " + i + " from " + maxAttempts);
+ //ignore
+ }
+ finally
+ {
+ if (sessionLocal != null)
+ {
+ try
+ {
+ sessionLocal.refresh(false);
+ sessionLocal.logout();
+ }
+ catch (RepositoryException e)
+ {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ }
+ }
}
- catch (Exception e)
- {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
}
14 years, 8 months
exo-jcr SVN: r1713 - jcr/trunk/exo.jcr.component.core.
by do-not-reply＠jboss.org
Author: nzamosenchuk
Date: 2010-02-08 05:31:50 -0500 (Mon, 08 Feb 2010)
New Revision: 1713
Modified:
jcr/trunk/exo.jcr.component.core/pom.xml
Log:
EXOJCR-472: TestLockPerstistentDataManager excluded, when EXOJCR-472 will be continued, need to review, what datasource to use for the test.
Modified: jcr/trunk/exo.jcr.component.core/pom.xml
===================================================================
--- jcr/trunk/exo.jcr.component.core/pom.xml 2010-02-08 10:10:44 UTC (rev 1712)
+++ jcr/trunk/exo.jcr.component.core/pom.xml 2010-02-08 10:31:50 UTC (rev 1713)
@@ -398,6 +398,7 @@
<exclude>org/exoplatform/services/jcr/**/impl/**/TestSessionDataManager.java</exclude>
<exclude>org/exoplatform/services/jcr/**/impl/**/TestLinkedWorkspaceStorageCacheMetrics.java</exclude>
<exclude>org/exoplatform/services/jcr/**/impl/**/SQLBenchmarkTest.java</exclude>
+ <exclude>org/exoplatform/services/jcr/**/impl/**/TestLockPerstistentDataManager.java</exclude>
</excludes>
</configuration>
</plugin>
@@ -655,6 +656,7 @@
<exclude>org/exoplatform/services/jcr/**/impl/**/TestSessionDataManager.java</exclude>
<exclude>org/exoplatform/services/jcr/**/impl/**/TestLinkedWorkspaceStorageCacheMetrics.java</exclude>
<exclude>org/exoplatform/services/jcr/**/impl/**/SQLBenchmarkTest.java</exclude>
+ <exclude>org/exoplatform/services/jcr/**/impl/**/TestLockPerstistentDataManager.java</exclude>
<!-- From TCK -->
<exclude>org/apache/jackrabbit/test/api/TestAll.java</exclude>
<exclude>org/apache/jackrabbit/test/api/**/Abstract*.java</exclude>
14 years, 8 months
exo-jcr SVN: r1712 - jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache.
by do-not-reply＠jboss.org
Author: nzamosenchuk
Date: 2010-02-08 05:10:44 -0500 (Mon, 08 Feb 2010)
New Revision: 1712
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/JBossCacheWorkspaceStorageCache.java
Log:
EXOJCR-481: added check for null-value.
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/JBossCacheWorkspaceStorageCache.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/JBossCacheWorkspaceStorageCache.java 2010-02-08 08:38:18 UTC (rev 1711)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/JBossCacheWorkspaceStorageCache.java 2010-02-08 10:10:44 UTC (rev 1712)
@@ -265,10 +265,19 @@
{
throw new RepositoryConfigurationException("Cache configuration not found");
}
+
+ // create cache using custom factory
+ ExoJBossCacheFactory<Serializable, Object> factory;
+
+ if (transactionService != null)
+ {
+ factory = new ExoJBossCacheFactory<Serializable, Object>(cfm, transactionService.getTransactionManager());
+ }
+ else
+ {
+ factory = new ExoJBossCacheFactory<Serializable, Object>(cfm);
+ }
- // create cache using custom factory
- ExoJBossCacheFactory<Serializable, Object> factory =
- new ExoJBossCacheFactory<Serializable, Object>(cfm, transactionService.getTransactionManager());
this.cache = new BufferedJBossCache(factory.createCache(wsConfig.getCache()));
this.itemsRoot = Fqn.fromElements(ITEMS);
14 years, 8 months
exo-jcr SVN: r1711 - jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/jdbc.
by do-not-reply＠jboss.org
Author: nzamosenchuk
Date: 2010-02-08 03:38:18 -0500 (Mon, 08 Feb 2010)
New Revision: 1711
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/jdbc/LockJDBCContainer.java
Log:
EXOJCR-472: Close connection in LockJDBCContainer's constructor, if !jdbcConn.isClosed().
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/jdbc/LockJDBCContainer.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/jdbc/LockJDBCContainer.java 2010-02-08 07:35:26 UTC (rev 1710)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/jdbc/LockJDBCContainer.java 2010-02-08 08:38:18 UTC (rev 1711)
@@ -84,7 +84,7 @@
}
finally
{
- if (jdbcConn != null)
+ if (jdbcConn != null && !jdbcConn.isClosed())
{
try
{
14 years, 8 months
exo-jcr SVN: r1710 - in jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr: impl/storage/inmemory and 2 other directories.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2010-02-08 02:35:26 -0500 (Mon, 08 Feb 2010)
New Revision: 1710
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/CacheableWorkspaceDataManager.java
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/inmemory/InmemoryContainerImpl.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/storage/WorkspaceDataContainer.java
Log:
EXOJCR-464: avoid deadlock on Sybase DB
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/CacheableWorkspaceDataManager.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/CacheableWorkspaceDataManager.java 2010-02-05 17:21:55 UTC (rev 1709)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/CacheableWorkspaceDataManager.java 2010-02-08 07:35:26 UTC (rev 1710)
@@ -37,11 +37,6 @@
import java.util.concurrent.CountDownLatch;
import javax.jcr.RepositoryException;
-import javax.transaction.HeuristicMixedException;
-import javax.transaction.HeuristicRollbackException;
-import javax.transaction.NotSupportedException;
-import javax.transaction.RollbackException;
-import javax.transaction.SystemException;
import javax.transaction.TransactionManager;
/**
@@ -379,7 +374,7 @@
public List<PropertyData> getChildPropertiesData(NodeData nodeData) throws RepositoryException
{
List<PropertyData> childs = getChildPropertiesData(nodeData, false);
- for (PropertyData prop: childs)
+ for (PropertyData prop : childs)
{
fixPropertyValues(prop);
}
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 2010-02-05 17:21:55 UTC (rev 1709)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/WorkspacePersistentDataManager.java 2010-02-08 07:35:26 UTC (rev 1710)
@@ -92,7 +92,6 @@
* Value sorages provider (for dest file suggestion on save).
*/
// TODO protected final ValueStoragePluginProvider valueStorageProvider;
-
/**
* Persistent level listeners. This listeners can be filtered by filters from
* <code>liestenerFilters</code> list.
@@ -234,7 +233,7 @@
// if it's different container instances
? systemDataContainer.equals(dataContainer) && thisConnection != null
// but container confugrations are same and non-system connnection open
- // reuse this connection as system
+ // reuse this connection as system
? systemDataContainer.reuseConnection(thisConnection)
// or open one new system
: systemDataContainer.openConnection()
@@ -256,7 +255,7 @@
// if it's different container instances
? dataContainer.equals(systemDataContainer) && systemConnection != null
// but container confugrations are same and system connnection open
- // reuse system connection as this
+ // reuse system connection as this
? dataContainer.reuseConnection(systemConnection)
// or open one new
: dataContainer.openConnection()
@@ -273,7 +272,7 @@
protected PlainChangesLogImpl save(PlainChangesLog changesLog) throws InvalidItemStateException,
RepositoryException, IOException
{ //LOG.info(changesLog.dump())
- // copy state
+ // copy state
PlainChangesLogImpl newLog =
new PlainChangesLogImpl(new ArrayList<ItemState>(), changesLog.getSessionId(), changesLog.getEventType(),
changesLog.getPairId());
@@ -554,29 +553,43 @@
else
{
// check in persistence
- final WorkspaceStorageConnection acon = con; //dataContainer.openConnection();
- try
+ if (dataContainer.isCheckSNSNewConnection())
{
- NodeData parent = (NodeData)acon.getItemData(node.getParentIdentifier());
- QPathEntry myName = node.getQPath().getEntries()[node.getQPath().getEntries().length - 1];
- ItemData sibling =
- acon.getItemData(parent, new QPathEntry(myName.getNamespace(), myName.getName(),
- myName.getIndex() - 1));
- if (sibling == null || !sibling.isNode())
+ final WorkspaceStorageConnection acon = dataContainer.openConnection();
+ try
{
- throw new InvalidItemStateException("Node can't be saved " + node.getQPath().getAsString()
- + ". No same-name sibling exists with index " + (myName.getIndex() - 1) + ".");
+ checkPersistedSNS(node, acon);
}
+ finally
+ {
+ acon.close();
+ }
}
- finally
+ else
{
- //acon.close();
+ checkPersistedSNS(node, con);
}
}
}
}
/**
+ * Check if same-name sibling exists in persistence.
+ */
+ private void checkPersistedSNS(NodeData node, WorkspaceStorageConnection acon) throws RepositoryException
+ {
+ NodeData parent = (NodeData)acon.getItemData(node.getParentIdentifier());
+ QPathEntry myName = node.getQPath().getEntries()[node.getQPath().getEntries().length - 1];
+ ItemData sibling =
+ acon.getItemData(parent, new QPathEntry(myName.getNamespace(), myName.getName(), myName.getIndex() - 1));
+ if (sibling == null || !sibling.isNode())
+ {
+ throw new InvalidItemStateException("Node can't be saved " + node.getQPath().getAsString()
+ + ". No same-name sibling exists with index " + (myName.getIndex() - 1) + ".");
+ }
+ }
+
+ /**
* Performs actual item data deleting.
*
* @param item
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/inmemory/InmemoryContainerImpl.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/inmemory/InmemoryContainerImpl.java 2010-02-05 17:21:55 UTC (rev 1709)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/inmemory/InmemoryContainerImpl.java 2010-02-08 07:35:26 UTC (rev 1710)
@@ -99,4 +99,12 @@
{
return this.equals(another);
}
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isCheckSNSNewConnection()
+ {
+ return true;
+ }
}
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 2010-02-05 17:21:55 UTC (rev 1709)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCWorkspaceDataContainer.java 2010-02-08 07:35:26 UTC (rev 1710)
@@ -45,7 +45,6 @@
import java.io.File;
import java.io.IOException;
import java.sql.Connection;
-import java.sql.DatabaseMetaData;
import java.sql.DriverManager;
import java.sql.SQLException;
@@ -106,6 +105,8 @@
protected String storageVersion;
+ protected boolean checkSNSNewConnection;
+
protected int maxBufferSize;
protected File swapDirectory;
@@ -332,6 +333,15 @@
}
LOG.info("Using a dialect '" + this.dbDialect + "'");
+ try
+ {
+ this.checkSNSNewConnection = wsConfig.getContainer().getParameterBoolean(CHECK_SNS_NEW_CONNECTION);
+ }
+ catch (RepositoryConfigurationException e)
+ {
+ this.checkSNSNewConnection = true;
+ }
+
// ------------- Values swap config ------------------
try
{
@@ -878,4 +888,13 @@
{
return dbUserName;
}
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isCheckSNSNewConnection()
+ {
+ return checkSNSNewConnection;
+ }
+
}
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/storage/WorkspaceDataContainer.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/storage/WorkspaceDataContainer.java 2010-02-05 17:21:55 UTC (rev 1709)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/storage/WorkspaceDataContainer.java 2010-02-08 07:35:26 UTC (rev 1710)
@@ -47,6 +47,8 @@
public final static String DEF_SWAPDIR = System.getProperty("java.io.tmpdir");
+ public final static String CHECK_SNS_NEW_CONNECTION = "check-sns-new-connection";
+
/**
* [G.A] do we need it here or in WorkspaceDataManager better??
*
@@ -89,4 +91,8 @@
*/
WorkspaceStorageConnection reuseConnection(WorkspaceStorageConnection original) throws RepositoryException;
+ /**
+ * @return the value of 'check-sns-new-connection' parameter
+ */
+ boolean isCheckSNSNewConnection();
}
14 years, 8 months
exo-jcr SVN: r1709 - jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/jdbc.
by do-not-reply＠jboss.org
Author: sergiykarpenko
Date: 2010-02-05 12:21:55 -0500 (Fri, 05 Feb 2010)
New Revision: 1709
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/jdbc/LockJDBCConnection.java
Log:
EXOJCR-472: LockJDBCConnection isLockDataExist fixed
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/jdbc/LockJDBCConnection.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/jdbc/LockJDBCConnection.java 2010-02-05 17:20:02 UTC (rev 1708)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/jdbc/LockJDBCConnection.java 2010-02-05 17:21:55 UTC (rev 1709)
@@ -343,7 +343,7 @@
isLockDataExist.setString(1, identifier);
isLockDataExist.setString(2, wsName);
// get result set
- ResultSet result = getLockData.executeQuery();
+ ResultSet result = isLockDataExist.executeQuery();
return result.next();
}
catch (SQLException e)
14 years, 8 months