exo-jcr SVN: r1526 - jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache.
by do-not-reply＠jboss.org
Author: areshetnyak
Date: 2010-01-21 08:35:02 -0500 (Thu, 21 Jan 2010)
New Revision: 1526
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/CacheableLockManager.java
Log:
EXOJCR-332 : Move code from start in CacheableLockManager
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/CacheableLockManager.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/CacheableLockManager.java 2010-01-21 13:33:46 UTC (rev 1525)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/CacheableLockManager.java 2010-01-21 13:35:02 UTC (rev 1526)
@@ -215,9 +215,6 @@
.getCacheConfig();
CacheFactory<Serializable, Object> factory = new DefaultCacheFactory<Serializable, Object>();
- // Context recall is a workaround of JDBCCacheLoader starting.
- context.recall();
-
cache = factory.createCache(pathToConfig, false);
if (transactionService.getTransactionManager() != null)
@@ -226,6 +223,15 @@
}
cache.create();
+ cache.start();
+
+ if (!cache.getRoot().hasChild(lockRoot))
+ {
+ cache.getRoot().addChild(lockRoot);
+ }
+
+ // Context recall is a workaround of JDBCCacheLoader starting.
+ context.recall();
}
else
{
@@ -477,15 +483,6 @@
*/
public void start()
{
- cache.start();
-
- if (!cache.getRoot().hasChild(lockRoot))
- {
- cache.getRoot().addChild(lockRoot);
- }
-
- // Context recall is a workaround of JDBCCacheLoader starting.
- context.recall();
lockRemover = new LockRemover(this);
}
16 years, 3 months
exo-jcr SVN: r1525 - jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/jbosscache.
by do-not-reply＠jboss.org
Author: skabashnyuk
Date: 2010-01-21 08:33:46 -0500 (Thu, 21 Jan 2010)
New Revision: 1525
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/jbosscache/JBossCacheIndexInfos.java
Log:
EXOJCR-423 : create structure if need
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/jbosscache/JBossCacheIndexInfos.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/jbosscache/JBossCacheIndexInfos.java 2010-01-21 13:32:56 UTC (rev 1524)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/jbosscache/JBossCacheIndexInfos.java 2010-01-21 13:33:46 UTC (rev 1525)
@@ -102,9 +102,12 @@
// store parsed FQN to avoid it's parsing each time cache event is generated
namesFqn = Fqn.fromString(system ? SYSINDEX_NAMES : INDEX_NAMES);
Node<Serializable, Object> cacheRoot = cache.getRoot();
-
// prepare cache structures
- cacheRoot.addChild(namesFqn).setResident(true);
+ if (!cacheRoot.hasChild(namesFqn))
+ {
+ cache.getInvocationContext().getOptionOverrides().setCacheModeLocal(true);
+ cacheRoot.addChild(namesFqn).setResident(true);
+ }
if (modeHandler.getMode() == IndexerIoMode.READ_ONLY)
{
// Currently READ_ONLY is set, so new lists should be fired to multiIndex.
16 years, 3 months
exo-jcr SVN: r1524 - jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/jbosscache.
by do-not-reply＠jboss.org
Author: skabashnyuk
Date: 2010-01-21 08:32:56 -0500 (Thu, 21 Jan 2010)
New Revision: 1524
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/jbosscache/JbossCacheIndexUpdateMonitor.java
Log:
EXOJCR-423 : create structure if need
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/jbosscache/JbossCacheIndexUpdateMonitor.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/jbosscache/JbossCacheIndexUpdateMonitor.java 2010-01-21 13:30:40 UTC (rev 1523)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/jbosscache/JbossCacheIndexUpdateMonitor.java 2010-01-21 13:32:56 UTC (rev 1524)
@@ -79,9 +79,12 @@
Node<Serializable, Object> cacheRoot = cache.getRoot();
// prepare cache structures
+ if (!cacheRoot.hasChild(PARAMETER_ROOT))
+ {
+ cache.getInvocationContext().getOptionOverrides().setCacheModeLocal(true);
+ cacheRoot.addChild(PARAMETER_ROOT).setResident(true);
+ }
- cacheRoot.addChild(PARAMETER_ROOT).setResident(true);
-
if (IndexerIoMode.READ_WRITE == modeHandler.getMode())
{
setUpdateInProgress(false);
16 years, 3 months
exo-jcr SVN: r1523 - jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache.
by do-not-reply＠jboss.org
Author: nfilotto
Date: 2010-01-21 08:30:40 -0500 (Thu, 21 Jan 2010)
New Revision: 1523
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/JBossCacheWorkspaceStorageCache.java
Log:
EXOJCR-325: implementation of the JBossCacheWorkspaceStorageCache.getSize method with the new total amount of resident node
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-01-21 12:56:48 UTC (rev 1522)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/JBossCacheWorkspaceStorageCache.java 2010-01-21 13:30:40 UTC (rev 1523)
@@ -33,7 +33,6 @@
import org.exoplatform.services.jcr.impl.Constants;
import org.exoplatform.services.jcr.impl.dataflow.TransientNodeData;
import org.exoplatform.services.jcr.impl.dataflow.TransientPropertyData;
-import org.exoplatform.services.jcr.impl.dataflow.persistent.TxIsolatedOperation;
import org.exoplatform.services.log.ExoLogger;
import org.exoplatform.services.log.Log;
import org.exoplatform.services.transaction.TransactionService;
@@ -41,7 +40,6 @@
import org.jboss.cache.DefaultCacheFactory;
import org.jboss.cache.Fqn;
import org.jboss.cache.Node;
-import org.jboss.cache.UnversionedNode;
import java.io.Serializable;
import java.util.ArrayList;
@@ -665,7 +663,7 @@
public long getSize()
{
// Total number of JBC nodes in the cache - the total amount of resident nodes
- return cache.getNumberOfNodes() - 6;
+ return cache.getNumberOfNodes() - 5;
}
/**
16 years, 3 months
exo-jcr SVN: r1522 - jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache.
by do-not-reply＠jboss.org
Author: nfilotto
Date: 2010-01-21 07:56:48 -0500 (Thu, 21 Jan 2010)
New Revision: 1522
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/BufferedJBossCache.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/JBossCacheWorkspaceStorageCache.java
Log:
EXOJCR-325: implementation of the JBossCacheWorkspaceStorageCache.getSize method
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/BufferedJBossCache.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/BufferedJBossCache.java 2010-01-21 11:53:46 UTC (rev 1521)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/BufferedJBossCache.java 2010-01-21 12:56:48 UTC (rev 1522)
@@ -156,6 +156,11 @@
this.local.set(local);
}
+ public int getNumberOfNodes()
+ {
+ return ((CacheSPI<Serializable, Object>)parentCache).getNumberOfNodes();
+ }
+
/* (non-Javadoc)
* @see org.jboss.cache.Cache#addCacheListener(java.lang.Object)
*/
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-01-21 11:53:46 UTC (rev 1521)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/JBossCacheWorkspaceStorageCache.java 2010-01-21 12:56:48 UTC (rev 1522)
@@ -664,8 +664,8 @@
*/
public long getSize()
{
- // TODO, cache seems doesn't have a methods to calculate it's size
- return -1;
+ // Total number of JBC nodes in the cache - the total amount of resident nodes
+ return cache.getNumberOfNodes() - 6;
}
/**
16 years, 3 months
exo-jcr SVN: r1521 - in jcr/trunk/exo.jcr.component.core/src: test/java/org/exoplatform/services/jcr/lab/cluster/test and 1 other directory.
by do-not-reply＠jboss.org
Author: pnedonosko
Date: 2010-01-21 06:53:46 -0500 (Thu, 21 Jan 2010)
New Revision: 1521
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/FilePersistedValueData.java
jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/lab/cluster/test/TestBLOBValue.java
Log:
EXOJCR-404 test and TODO
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/FilePersistedValueData.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/FilePersistedValueData.java 2010-01-21 09:34:18 UTC (rev 1520)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/FilePersistedValueData.java 2010-01-21 11:53:46 UTC (rev 1521)
@@ -265,6 +265,7 @@
// write canonical file path
if (file != null)
{
+ // TODO for tests byte[] buf = file.getPath().getBytes("UTF-8");
byte[] buf = file.getCanonicalPath().getBytes("UTF-8");
out.writeInt(buf.length);
out.write(buf);
Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/lab/cluster/test/TestBLOBValue.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/lab/cluster/test/TestBLOBValue.java 2010-01-21 09:34:18 UTC (rev 1520)
+++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/lab/cluster/test/TestBLOBValue.java 2010-01-21 11:53:46 UTC (rev 1521)
@@ -7,28 +7,19 @@
import java.io.InputStream;
import java.util.Calendar;
-import javax.jcr.ItemExistsException;
import javax.jcr.Node;
import javax.jcr.NodeIterator;
-import javax.jcr.PathNotFoundException;
import javax.jcr.Property;
-import javax.jcr.RepositoryException;
import javax.jcr.Session;
-import javax.jcr.lock.LockException;
-import javax.jcr.nodetype.ConstraintViolationException;
-import javax.jcr.nodetype.NoSuchNodeTypeException;
-import javax.jcr.version.VersionException;
public class TestBLOBValue extends JcrAPIBaseTest
{
private static final String TEST_ROOT_NAME = "TestBLOBValue";
- private static final int FILE_SIZE_KB = 10 * 1024;
+ private static final int FILE_SIZE_KB = 512;
- private static final int FILES_COUNT = 1024;
+ private static final int FILES_COUNT = 10;
- private static final String FILE_PATH = "F:/Books/jboss/Manning JBoss in Action Jan 2009.pdf";
-
private static File testFile;
private Node testRoot;
@@ -71,7 +62,6 @@
if (testFile == null)
{
testFile = createBLOBTempFile(FILE_SIZE_KB);
- //testFile = new File(FILE_PATH);
}
}
@@ -95,13 +85,13 @@
testRoot.save();
}
- //testRoot.remove();
- //root.save();
+ testRoot.remove();
+ root.save();
- //super.tearDown();
+ super.tearDown();
}
- public void _testAddProperty() throws Exception
+ public void testAddProperty() throws Exception
{
// write
Property text = testRoot.setProperty("text", "string property");
@@ -129,6 +119,7 @@
assertEquals(testFile.length(), size);
}
+ // for read on another node of a cluster
public void _testReadProperty() throws Exception
{
// read
@@ -154,7 +145,7 @@
for (int i = 0; i < FILES_COUNT; i++)
{
File blob = createBLOBTempFile(size);
- addNTFile("node" + i, blob);
+ addNTFile("file" + i, blob);
size += 1;
}
@@ -164,7 +155,8 @@
// it's ready for read
}
- public void testReadNTFiles() throws Exception
+ // for read on another node of a cluster
+ public void _testReadNTFiles() throws Exception
{
// read series of FILES_COUNT were added each with size + 1K bytes
int size = FILE_SIZE_KB;
@@ -189,10 +181,5 @@
size += 1;
}
}
-
- public void testUpdateProperty() throws Exception
- {
-
- }
-
}
+
16 years, 3 months
exo-jcr SVN: r1520 - jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache.
by do-not-reply＠jboss.org
Author: areshetnyak
Date: 2010-01-21 04:34:18 -0500 (Thu, 21 Jan 2010)
New Revision: 1520
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/CacheableLockManager.java
Log:
EXOJCR-424 : Make the CacheableLockManager transaction
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/CacheableLockManager.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/CacheableLockManager.java 2010-01-21 09:22:48 UTC (rev 1519)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/CacheableLockManager.java 2010-01-21 09:34:18 UTC (rev 1520)
@@ -44,12 +44,14 @@
import org.exoplatform.services.jcr.impl.core.lock.SessionLockManager;
import org.exoplatform.services.jcr.impl.dataflow.TransientItemData;
import org.exoplatform.services.jcr.impl.dataflow.TransientPropertyData;
+import org.exoplatform.services.jcr.impl.dataflow.persistent.TxIsolatedOperation;
import org.exoplatform.services.jcr.impl.dataflow.persistent.WorkspacePersistentDataManager;
import org.exoplatform.services.jcr.impl.storage.JCRInvalidItemStateException;
import org.exoplatform.services.jcr.observation.ExtendedEvent;
import org.exoplatform.services.log.ExoLogger;
import org.exoplatform.services.log.Log;
import org.exoplatform.services.naming.InitialContextInitializer;
+import org.exoplatform.services.transaction.TransactionService;
import org.jboss.cache.Cache;
import org.jboss.cache.CacheFactory;
import org.jboss.cache.DefaultCacheFactory;
@@ -62,6 +64,8 @@
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
@@ -70,6 +74,7 @@
import javax.jcr.RepositoryException;
import javax.jcr.lock.LockException;
+import javax.transaction.TransactionManager;
/**
* Created by The eXo Platform SAS.
@@ -159,7 +164,7 @@
private final Fqn<String> lockRoot;
private Map<String, CacheableSessionLockManager> sessionLockManagers;
-
+
/**
* Constructor.
*
@@ -169,7 +174,7 @@
* @throws RepositoryConfigurationException
*/
public CacheableLockManager(WorkspacePersistentDataManager dataManager, WorkspaceEntry config,
- InitialContextInitializer context) throws RepositoryConfigurationException
+ InitialContextInitializer context, TransactionService transactionService) throws RepositoryConfigurationException
{
lockRoot = Fqn.fromElements(LOCKS);
@@ -214,6 +219,12 @@
context.recall();
cache = factory.createCache(pathToConfig, false);
+
+ if (transactionService.getTransactionManager() != null)
+ {
+ cache.getConfiguration().getRuntimeConfig().setTransactionManager(transactionService.getTransactionManager());
+ }
+
cache.create();
}
else
@@ -332,7 +343,7 @@
chengesLogList.add(iter.nextLog());
}
}
-
+
for (PlainChangesLog currChangesLog : chengesLogList)
{
String nodeIdentifier;
@@ -344,7 +355,7 @@
if (currChangesLog.getSize() < 2)
{
log.error("Incorrect changes log of type ExtendedEvent.LOCK size=" + currChangesLog.getSize()
- + "<2 \n" + currChangesLog.dump());
+ + "<2 \n" + currChangesLog.dump());
break;
}
nodeIdentifier = currChangesLog.getAllStates().get(0).getData().getParentIdentifier();
@@ -362,12 +373,12 @@
if (currChangesLog.getSize() < 2)
{
log.error("Incorrect changes log of type ExtendedEvent.UNLOCK size=" + currChangesLog.getSize()
- + "<2 \n" + currChangesLog.dump());
+ + "<2 \n" + currChangesLog.dump());
break;
}
internalUnLock(currChangesLog.getSessionId(), currChangesLog.getAllStates().get(0).getData()
- .getParentIdentifier());
+ .getParentIdentifier());
break;
default :
HashSet<String> removedLock = new HashSet<String>();
@@ -447,6 +458,8 @@
}
}
+ Collections.sort(removeLockList);
+
for (String rLock : removeLockList)
{
removeLock(rLock);
16 years, 3 months
exo-jcr SVN: r1519 - jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache.
by do-not-reply＠jboss.org
Author: areshetnyak
Date: 2010-01-21 04:22:48 -0500 (Thu, 21 Jan 2010)
New Revision: 1519
Modified:
jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/CacheableLockManager.java
Log:
EXOJCR-424 : Make the CacheableLockManager transaction
Modified: jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/CacheableLockManager.java
===================================================================
--- jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/CacheableLockManager.java 2010-01-20 23:33:30 UTC (rev 1518)
+++ jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/CacheableLockManager.java 2010-01-21 09:22:48 UTC (rev 1519)
@@ -44,12 +44,14 @@
import org.exoplatform.services.jcr.impl.core.lock.SessionLockManager;
import org.exoplatform.services.jcr.impl.dataflow.TransientItemData;
import org.exoplatform.services.jcr.impl.dataflow.TransientPropertyData;
+import org.exoplatform.services.jcr.impl.dataflow.persistent.TxIsolatedOperation;
import org.exoplatform.services.jcr.impl.dataflow.persistent.WorkspacePersistentDataManager;
import org.exoplatform.services.jcr.impl.storage.JCRInvalidItemStateException;
import org.exoplatform.services.jcr.observation.ExtendedEvent;
import org.exoplatform.services.log.ExoLogger;
import org.exoplatform.services.log.Log;
import org.exoplatform.services.naming.InitialContextInitializer;
+import org.exoplatform.services.transaction.TransactionService;
import org.jboss.cache.Cache;
import org.jboss.cache.CacheFactory;
import org.jboss.cache.DefaultCacheFactory;
@@ -62,6 +64,8 @@
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
@@ -70,6 +74,7 @@
import javax.jcr.RepositoryException;
import javax.jcr.lock.LockException;
+import javax.transaction.TransactionManager;
/**
* Created by The eXo Platform SAS.
@@ -159,7 +164,7 @@
private final Fqn<String> lockRoot;
private Map<String, CacheableSessionLockManager> sessionLockManagers;
-
+
/**
* Constructor.
*
@@ -169,7 +174,7 @@
* @throws RepositoryConfigurationException
*/
public CacheableLockManager(WorkspacePersistentDataManager dataManager, WorkspaceEntry config,
- InitialContextInitializer context) throws RepositoryConfigurationException
+ InitialContextInitializer context, TransactionService transactionService) throws RepositoryConfigurationException
{
lockRoot = Fqn.fromElements(LOCKS);
@@ -214,6 +219,12 @@
context.recall();
cache = factory.createCache(pathToConfig, false);
+
+ if (transactionService.getTransactionManager() != null)
+ {
+ cache.getConfiguration().getRuntimeConfig().setTransactionManager(transactionService.getTransactionManager());
+ }
+
cache.create();
}
else
@@ -332,7 +343,7 @@
chengesLogList.add(iter.nextLog());
}
}
-
+
for (PlainChangesLog currChangesLog : chengesLogList)
{
String nodeIdentifier;
@@ -344,7 +355,7 @@
if (currChangesLog.getSize() < 2)
{
log.error("Incorrect changes log of type ExtendedEvent.LOCK size=" + currChangesLog.getSize()
- + "<2 \n" + currChangesLog.dump());
+ + "<2 \n" + currChangesLog.dump());
break;
}
nodeIdentifier = currChangesLog.getAllStates().get(0).getData().getParentIdentifier();
@@ -362,12 +373,12 @@
if (currChangesLog.getSize() < 2)
{
log.error("Incorrect changes log of type ExtendedEvent.UNLOCK size=" + currChangesLog.getSize()
- + "<2 \n" + currChangesLog.dump());
+ + "<2 \n" + currChangesLog.dump());
break;
}
internalUnLock(currChangesLog.getSessionId(), currChangesLog.getAllStates().get(0).getData()
- .getParentIdentifier());
+ .getParentIdentifier());
break;
default :
HashSet<String> removedLock = new HashSet<String>();
@@ -447,6 +458,8 @@
}
}
+ Collections.sort(removeLockList);
+
for (String rLock : removeLockList)
{
removeLock(rLock);
16 years, 3 months
exo-jcr SVN: r1517 - jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/jbosscache.
by do-not-reply＠jboss.org
Author: skabashnyuk
Date: 2010-01-20 11:40:29 -0500 (Wed, 20 Jan 2010)
New Revision: 1517
Modified:
jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/jbosscache/JbossCacheIndexUpdateMonitor.java
Log:
EXOJCR-423 : Catch CacheException
Modified: jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/jbosscache/JbossCacheIndexUpdateMonitor.java
===================================================================
--- jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/jbosscache/JbossCacheIndexUpdateMonitor.java 2010-01-20 16:29:04 UTC (rev 1516)
+++ jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/jbosscache/JbossCacheIndexUpdateMonitor.java 2010-01-20 16:40:29 UTC (rev 1517)
@@ -26,6 +26,7 @@
import org.exoplatform.services.log.ExoLogger;
import org.exoplatform.services.log.Log;
import org.jboss.cache.Cache;
+import org.jboss.cache.CacheException;
import org.jboss.cache.CacheSPI;
import org.jboss.cache.Fqn;
import org.jboss.cache.Node;
@@ -89,7 +90,7 @@
{
// Currently READ_ONLY is set, so new lists should be fired to multiIndex.
cache.addCacheListener(this);
- }
+ }
}
/**
@@ -110,7 +111,7 @@
cache.addCacheListener(this);
}
}
-
+
/**
* @see org.exoplatform.services.jcr.impl.core.query.lucene.IndexUpdateMonitor#getUpdateInProgress()
*/
@@ -162,11 +163,19 @@
{
throw new IllegalStateException("Unable to set updateInProgress value in IndexerIoMode.READ_ONLY mode");
}
- cache.put(PARAMETER_ROOT, PARAMETER_NAME, new Boolean(updateInProgress));
- for (IndexUpdateMonitorListener listener : listeners)
+ try
{
- listener.onUpdateInProgressChange(updateInProgress);
- }
+ cache.put(PARAMETER_ROOT, PARAMETER_NAME, new Boolean(updateInProgress));
+ for (IndexUpdateMonitorListener listener : listeners)
+ {
+ listener.onUpdateInProgressChange(updateInProgress);
+ }
+
+ }
+ catch (CacheException e)
+ {
+ log.error("Fail to change updateInProgress mode to " + updateInProgress, e);
+ }
}
/**
@@ -187,7 +196,7 @@
{
listeners.add(listener);
}
-
+
/**
* Called when a node of the cache has been modified. It will be used to trigger events
* when the value of <code>updateInProgress</code> has been changed remotely
@@ -206,7 +215,7 @@
}
else
{
- value = data.get(PARAMETER_NAME);
+ value = data.get(PARAMETER_NAME);
}
if (value == null)
{
@@ -217,7 +226,7 @@
for (IndexUpdateMonitorListener listener : listeners)
{
listener.onUpdateInProgressChange(updateInProgress);
- }
+ }
}
}
}
16 years, 3 months
exo-jcr SVN: r1516 - jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent.
by do-not-reply＠jboss.org
Author: pnedonosko
Date: 2010-01-20 11:29:04 -0500 (Wed, 20 Jan 2010)
New Revision: 1516
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 comment fix
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 16:25:23 UTC (rev 1515)
+++ 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 16:29:04 UTC (rev 1516)
@@ -121,7 +121,7 @@
// TODO can we do rollback if not in the tx thread?
// doRollback();
// TODO throw new RepositoryException(e);
- LOG.error("Commit impossible, thread is not associated with a transaction", e);
+ LOG.error("Commit impossible, thread is not associated with the transaction", e);
}
catch (SecurityException e)
{
16 years, 3 months