Author: manik.surtani(a)jboss.com
Date: 2008-04-24 11:33:27 -0400 (Thu, 24 Apr 2008)
New Revision: 5670
Modified:
core/trunk/src/main/java/org/jboss/cache/factories/XmlConfigurationParser.java
core/trunk/src/main/java/org/jboss/cache/interceptors/ActivationInterceptor.java
core/trunk/src/main/java/org/jboss/cache/interceptors/CacheLoaderInterceptor.java
core/trunk/src/test/java/org/jboss/cache/transaction/AsyncRollbackTransactionManager.java
Log:
resolved TODOs
Modified: core/trunk/src/main/java/org/jboss/cache/factories/XmlConfigurationParser.java
===================================================================
---
core/trunk/src/main/java/org/jboss/cache/factories/XmlConfigurationParser.java 2008-04-24
15:22:21 UTC (rev 5669)
+++
core/trunk/src/main/java/org/jboss/cache/factories/XmlConfigurationParser.java 2008-04-24
15:33:27 UTC (rev 5670)
@@ -522,12 +522,10 @@
{
regionConfigs.add(parseEvictionRegionConfig((Element) node,
ec.getDefaultEvictionPolicyClass(), eventQueueSize));
}
- catch (MissingPolicyException ignored)
+ catch (MissingPolicyException missingPolicy)
{
- // Just log a warning and continue
- // TODO (BES Oct-2006) I did it this way as that is how it worked
- // before, but why not just throw the exception?
-
LogFactory.getLog(EvictionConfig.class).warn(ignored.getLocalizedMessage());
+
LogFactory.getLog(EvictionConfig.class).warn(missingPolicy.getLocalizedMessage());
+ throw missingPolicy;
}
}
Modified:
core/trunk/src/main/java/org/jboss/cache/interceptors/ActivationInterceptor.java
===================================================================
---
core/trunk/src/main/java/org/jboss/cache/interceptors/ActivationInterceptor.java 2008-04-24
15:22:21 UTC (rev 5669)
+++
core/trunk/src/main/java/org/jboss/cache/interceptors/ActivationInterceptor.java 2008-04-24
15:33:27 UTC (rev 5670)
@@ -16,6 +16,7 @@
import org.jboss.cache.commands.tx.OptimisticPrepareCommand;
import org.jboss.cache.commands.tx.PrepareCommand;
import org.jboss.cache.commands.visitors.AbstractCommandsVisitor;
+import org.jboss.cache.factories.annotations.Inject;
import org.jboss.cache.invocation.CacheData;
import org.jboss.cache.loader.CacheLoader;
import org.jboss.cache.notifications.Notifier;
@@ -44,7 +45,6 @@
{
protected TransactionManager txMgr = null;
- //todo - this is never queried, is this expected behavior?
private long activations = 0;
/**
@@ -59,6 +59,12 @@
useCacheStore = false;
}
+ @Inject
+ public void injectTransactionManager(TransactionManager txMgr)
+ {
+ this.txMgr = txMgr;
+ }
+
@Override
public Object handleRemoveDataCommand(InvocationContext ctx, RemoveDataCommand
command) throws Throwable
{
Modified:
core/trunk/src/main/java/org/jboss/cache/interceptors/CacheLoaderInterceptor.java
===================================================================
---
core/trunk/src/main/java/org/jboss/cache/interceptors/CacheLoaderInterceptor.java 2008-04-24
15:22:21 UTC (rev 5669)
+++
core/trunk/src/main/java/org/jboss/cache/interceptors/CacheLoaderInterceptor.java 2008-04-24
15:33:27 UTC (rev 5670)
@@ -12,7 +12,6 @@
import org.jboss.cache.factories.annotations.Start;
import org.jboss.cache.interceptors.base.ChainedInterceptor;
import org.jboss.cache.invocation.CacheData;
-import org.jboss.cache.invocation.InterceptorChain;
import org.jboss.cache.loader.CacheLoader;
import org.jboss.cache.loader.CacheLoaderManager;
import org.jboss.cache.lock.LockManager;
@@ -40,7 +39,6 @@
private long cacheLoads = 0;
private long cacheMisses = 0;
private CacheLoaderManager clm;
- private InterceptorChain cacheCommand;
private LockManager lockManager;
protected TransactionTable txTable = null;
Modified:
core/trunk/src/test/java/org/jboss/cache/transaction/AsyncRollbackTransactionManager.java
===================================================================
---
core/trunk/src/test/java/org/jboss/cache/transaction/AsyncRollbackTransactionManager.java 2008-04-24
15:22:21 UTC (rev 5669)
+++
core/trunk/src/test/java/org/jboss/cache/transaction/AsyncRollbackTransactionManager.java 2008-04-24
15:33:27 UTC (rev 5670)
@@ -1,9 +1,7 @@
package org.jboss.cache.transaction;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Properties;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import javax.naming.Context;
import javax.naming.InitialContext;
@@ -15,10 +13,11 @@
import javax.transaction.RollbackException;
import javax.transaction.SystemException;
import javax.transaction.Transaction;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Properties;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
public class AsyncRollbackTransactionManager extends DummyTransactionManager
{
private static final long serialVersionUID = 5793952292960075970L;
@@ -114,7 +113,7 @@
if ((currentTx = getTransaction()) != null)
{
throw new NotSupportedException(Thread.currentThread() +
- " is already associated with a transaction (" + currentTx +
")");
+ " is already associated with a transaction (" + currentTx +
")");
}
AsyncRollbackTransaction tx = new AsyncRollbackTransaction(this, timeout);
setTransaction(tx);
@@ -147,17 +146,13 @@
super.commit();
}
-
public void resume(Transaction tx) throws InvalidTransactionException,
IllegalStateException, SystemException
{
- //TODO Not implemented TX timeout counting
super.resume(tx);
}
-
public Transaction suspend() throws SystemException
{
- //TODO Not implemented TX timeout counting
return super.suspend();
}
Show replies by date