4:20 a.m.
Author: manik.surtani(a)jboss.com
Date: 2008-04-24 05:20:40 -0400 (Thu, 24 Apr 2008)
New Revision: 5653
Modified:
core/trunk/src/main/java/org/jboss/cache/invocation/CacheData.java
core/trunk/src/main/java/org/jboss/cache/invocation/CacheLifecycleManager.java
core/trunk/src/main/java/org/jboss/cache/invocation/CacheTransactionHelper.java
core/trunk/src/main/java/org/jboss/cache/invocation/InterceptorChain.java
Log:
Added todos
Modified: core/trunk/src/main/java/org/jboss/cache/invocation/CacheData.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/invocation/CacheData.java 2008-04-24 08:51:02
UTC (rev 5652)
+++ core/trunk/src/main/java/org/jboss/cache/invocation/CacheData.java 2008-04-24 09:20:40
UTC (rev 5653)
@@ -7,10 +7,10 @@
import org.jboss.cache.Node;
import org.jboss.cache.NodeNotExistsException;
import org.jboss.cache.NodeSPI;
-import org.jboss.cache.factories.annotations.Inject;
import org.jboss.cache.buddyreplication.BuddyFqnTransformer;
import org.jboss.cache.buddyreplication.BuddyManager;
import org.jboss.cache.config.Configuration;
+import org.jboss.cache.factories.annotations.Inject;
import org.jboss.cache.marshall.NodeData;
import org.jboss.cache.optimistic.DataVersion;
import org.jboss.cache.transaction.GlobalTransaction;
@@ -28,6 +28,7 @@
* @author Mircea.Markus(a)jboss.com
* @since 2.2
*/
+// TODO: Rename to DataContainer (?) and move to org.jboss.cache
public class CacheData
{
@@ -40,7 +41,7 @@
*/
private NodeSPI root;
- @Inject
+ @Inject
public void injectDependencies(Configuration configuration)
{
this.configuration = configuration;
Modified: core/trunk/src/main/java/org/jboss/cache/invocation/CacheLifecycleManager.java
===================================================================
---
core/trunk/src/main/java/org/jboss/cache/invocation/CacheLifecycleManager.java 2008-04-24
08:51:02 UTC (rev 5652)
+++
core/trunk/src/main/java/org/jboss/cache/invocation/CacheLifecycleManager.java 2008-04-24
09:20:40 UTC (rev 5653)
@@ -26,6 +26,7 @@
* @author Mircea.Markus(a)jboss.com
* @since 2.2
*/
+// TODO: Rename to LifecycleManager and move to org.jboss.cache
public class CacheLifecycleManager
{
private static Log log = LogFactory.getLog(CacheLifecycleManager.class);
@@ -146,7 +147,8 @@
log.warn("Needed to call stop() before destroying but stop() "
+
"threw exception. Proceeding to destroy", e);
}
- } else
+ }
+ else
return;
}
@@ -282,7 +284,8 @@
};
Runtime.getRuntime().addShutdownHook(shutdownHook);
- } else
+ }
+ else
{
if (log.isTraceEnabled())
log.trace("Not registering a shutdown hook. Configured behavior =
" + configuration.getShutdownHookBehavior());
@@ -415,7 +418,8 @@
category.append(rpcManager.getLocalAddress().toString().replace('.',
'_'));
}
}
- } else
+ }
+ else
{
// we're in LOCAL mode
category.append("_LOCAL");
@@ -467,7 +471,8 @@
{
Thread.currentThread().interrupt();
}
- } else
+ }
+ else
{
log.warn("Received a remote call but the cache is not in STARTED state -
ignoring call.");
}
Modified: core/trunk/src/main/java/org/jboss/cache/invocation/CacheTransactionHelper.java
===================================================================
---
core/trunk/src/main/java/org/jboss/cache/invocation/CacheTransactionHelper.java 2008-04-24
08:51:02 UTC (rev 5652)
+++
core/trunk/src/main/java/org/jboss/cache/invocation/CacheTransactionHelper.java 2008-04-24
09:20:40 UTC (rev 5653)
@@ -4,8 +4,8 @@
import org.apache.commons.logging.LogFactory;
import org.jboss.cache.CacheException;
import org.jboss.cache.RPCManager;
+import org.jboss.cache.config.Configuration;
import org.jboss.cache.factories.annotations.Inject;
-import org.jboss.cache.config.Configuration;
import org.jboss.cache.transaction.GlobalTransaction;
import org.jboss.cache.transaction.OptimisticTransactionEntry;
import org.jboss.cache.transaction.TransactionEntry;
@@ -21,6 +21,7 @@
* @author Mircea.Markus(a)jboss.com
* @since 2.2
*/
+// TODO: Rename to GlobalTransactionFactory, and put in org.jboss.cache.transaction
public class CacheTransactionHelper
{
@@ -42,7 +43,7 @@
@Inject
public void initialize(TransactionTable transactionTable, TransactionManager
transactionManager,
- RPCManager rpcManager, Configuration configuration)
+ RPCManager rpcManager, Configuration configuration)
{
this.transactionTable = transactionTable;
this.transactionManager = transactionManager;
@@ -93,7 +94,8 @@
if (status != Status.STATUS_COMMITTED)
{
log.warn("status is " + status + " (not ACTIVE or PREPARING);
returning null)", new Throwable());
- } else
+ }
+ else
{
log.trace("status is COMMITTED; returning null");
}
Modified: core/trunk/src/main/java/org/jboss/cache/invocation/InterceptorChain.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/invocation/InterceptorChain.java 2008-04-24
08:51:02 UTC (rev 5652)
+++ core/trunk/src/main/java/org/jboss/cache/invocation/InterceptorChain.java 2008-04-24
09:20:40 UTC (rev 5653)
@@ -21,6 +21,7 @@
* @author Mircea.Markus(a)jboss.com
* @since 2.2
*/
+// TODO: Move to org.jboss.cache.interceptors
public class InterceptorChain
{
/**