JBoss Cache SVN: r7754 - core/branches/3.0.X/src/main/java/org/jboss/cache.
by jbosscache-commits＠lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2009-02-23 07:38:05 -0500 (Mon, 23 Feb 2009)
New Revision: 7754
Modified:
core/branches/3.0.X/src/main/java/org/jboss/cache/DefaultCacheFactory.java
Log:
Parser log messages
Modified: core/branches/3.0.X/src/main/java/org/jboss/cache/DefaultCacheFactory.java
===================================================================
--- core/branches/3.0.X/src/main/java/org/jboss/cache/DefaultCacheFactory.java 2009-02-23 12:14:34 UTC (rev 7753)
+++ core/branches/3.0.X/src/main/java/org/jboss/cache/DefaultCacheFactory.java 2009-02-23 12:38:05 UTC (rev 7754)
@@ -24,7 +24,6 @@
import org.jboss.cache.annotations.Compat;
import org.jboss.cache.config.Configuration;
import org.jboss.cache.config.ConfigurationException;
-import org.jboss.cache.config.LegacyConfigurationException;
import org.jboss.cache.config.parsing.XmlConfigurationParser;
import org.jboss.cache.config.parsing.XmlConfigurationParser2x;
import org.jboss.cache.factories.ComponentFactory;
@@ -37,15 +36,14 @@
/**
* Default implementation of the {@link org.jboss.cache.CacheFactory} interface.
* <p/>
- * This is a special instance of a {@link ComponentFactory} which contains bootstrap information for the
- * {@link org.jboss.cache.factories.ComponentRegistry}.
+ * This is a special instance of a {@link ComponentFactory} which contains bootstrap information for the {@link
+ * org.jboss.cache.factories.ComponentRegistry}.
* <p/>
*
* @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a>
* @see org.jboss.cache.factories.ComponentFactory
*/
-public class DefaultCacheFactory<K, V> extends ComponentFactory implements CacheFactory<K, V>
-{
+public class DefaultCacheFactory<K, V> extends ComponentFactory implements CacheFactory<K, V> {
private ClassLoader defaultClassLoader;
@@ -57,38 +55,37 @@
@SuppressWarnings("unchecked")
@Deprecated
@Compat
- public static CacheFactory getInstance()
- {
+ public static CacheFactory getInstance() {
return new DefaultCacheFactory();
}
- public Cache<K, V> createCache() throws ConfigurationException
- {
+ public Cache<K, V> createCache() throws ConfigurationException {
return createCache(true);
}
- public Cache<K, V> createCache(boolean start) throws ConfigurationException
- {
+ public Cache<K, V> createCache(boolean start) throws ConfigurationException {
return createCache(new Configuration(), start);
}
- public Cache<K, V> createCache(String configFileName) throws ConfigurationException
- {
+ public Cache<K, V> createCache(String configFileName) throws ConfigurationException {
return createCache(configFileName, true);
}
- public Cache<K, V> createCache(String configFileName, boolean start) throws ConfigurationException
- {
+ public Cache<K, V> createCache(String configFileName, boolean start) throws ConfigurationException {
XmlConfigurationParser parser = new XmlConfigurationParser();
Configuration c;
- try
- {
+ try {
c = parser.parseFile(configFileName);
}
- catch (ConfigurationException e)
- {
+ catch (ConfigurationException e) {
+ if (log.isTraceEnabled()) {
+ log.trace("Had problems parsing configuration file.", e);
+ log.trace("Attempting to use a legacy parser.");
+ }
XmlConfigurationParser2x oldParser = new XmlConfigurationParser2x();
c = oldParser.parseFile(configFileName);
+ if (c != null && log.isInfoEnabled())
+ log.info("Detected legacy configuration file format when parsing configuration file. Migrating to the new (3.x) file format is recommended. See FAQs for details.");
}
return createCache(c, start);
}
@@ -100,8 +97,7 @@
* @return a cache
* @throws ConfigurationException if there are problems with the cfg
*/
- public Cache<K, V> createCache(Configuration configuration) throws ConfigurationException
- {
+ public Cache<K, V> createCache(Configuration configuration) throws ConfigurationException {
return createCache(configuration, true);
}
@@ -113,30 +109,24 @@
* @return a cache
* @throws ConfigurationException if there are problems with the cfg
*/
- public Cache<K, V> createCache(Configuration configuration, boolean start) throws ConfigurationException
- {
- try
- {
+ public Cache<K, V> createCache(Configuration configuration, boolean start) throws ConfigurationException {
+ try {
CacheSPI<K, V> cache = createAndWire(configuration);
if (start) cache.start();
return cache;
}
- catch (ConfigurationException ce)
- {
+ catch (ConfigurationException ce) {
throw ce;
}
- catch (RuntimeException re)
- {
+ catch (RuntimeException re) {
throw re;
}
- catch (Exception e)
- {
+ catch (Exception e) {
throw new RuntimeException(e);
}
}
- protected CacheSPI<K, V> createAndWire(Configuration configuration) throws Exception
- {
+ protected CacheSPI<K, V> createAndWire(Configuration configuration) throws Exception {
CacheSPI<K, V> spi = new CacheInvocationDelegate<K, V>();
bootstrap(spi, configuration);
return spi;
@@ -145,8 +135,7 @@
/**
* Bootstraps this factory with a Configuration and a ComponentRegistry.
*/
- private void bootstrap(CacheSPI spi, Configuration configuration)
- {
+ private void bootstrap(CacheSPI spi, Configuration configuration) {
// injection bootstrap stuff
componentRegistry = new ComponentRegistry(configuration, spi);
componentRegistry.registerDefaultClassLoader(defaultClassLoader);
@@ -161,21 +150,21 @@
*
* @param loader class loader to use as a default.
*/
- public void setDefaultClassLoader(ClassLoader loader)
- {
+ public void setDefaultClassLoader(ClassLoader loader) {
this.defaultClassLoader = loader;
}
- public Cache<K, V> createCache(InputStream is) throws ConfigurationException
- {
+ public Cache<K, V> createCache(InputStream is) throws ConfigurationException {
XmlConfigurationParser parser = new XmlConfigurationParser();
Configuration c = null;
- try
- {
+ try {
c = parser.parseStream(is);
}
- catch (ConfigurationException e)
- {
+ catch (ConfigurationException e) {
+ if (log.isTraceEnabled()) {
+ log.trace("Had problems parsing configuration file.", e);
+ log.trace("Attempting to use a legacy parser.");
+ }
XmlConfigurationParser2x oldParser = new XmlConfigurationParser2x();
c = oldParser.parseStream(is);
if (c != null && log.isInfoEnabled())
@@ -184,16 +173,14 @@
return createCache(c);
}
- public Cache<K, V> createCache(InputStream is, boolean start) throws ConfigurationException
- {
+ public Cache<K, V> createCache(InputStream is, boolean start) throws ConfigurationException {
XmlConfigurationParser parser = new XmlConfigurationParser();
Configuration c = parser.parseStream(is);
return createCache(c, start);
}
@Override
- protected <T> T construct(Class<T> componentType)
- {
+ protected <T> T construct(Class<T> componentType) {
throw new UnsupportedOperationException("Should never be invoked - this is a bootstrap factory.");
}
}
15 years, 10 months
JBoss Cache SVN: r7753 - benchmarks/benchmark-fwk/trunk/conf.
by jbosscache-commits＠lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2009-02-23 07:14:34 -0500 (Mon, 23 Feb 2009)
New Revision: 7753
Modified:
benchmarks/benchmark-fwk/trunk/conf/log4j.xml
Log:
Updated log4j defaults
Modified: benchmarks/benchmark-fwk/trunk/conf/log4j.xml
===================================================================
--- benchmarks/benchmark-fwk/trunk/conf/log4j.xml 2009-02-23 12:10:45 UTC (rev 7752)
+++ benchmarks/benchmark-fwk/trunk/conf/log4j.xml 2009-02-23 12:14:34 UTC (rev 7753)
@@ -27,6 +27,8 @@
</layout>
</appender>
+ <!-- disabled by default. Useful for long-running clustered benchmarks
+
<appender name="EMAIL" class="org.cachebench.utils.SMTPAppender">
<param name="Threshold" value="WARN"/>
<param name="BufferSize" value="1"/>
@@ -40,6 +42,7 @@
<param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
</layout>
</appender>
+ -->
<!-- The list of Categories-->
<category name="ClusterConfigurationCheck">
@@ -57,7 +60,6 @@
<category name="org.cachebench">
<priority value="INFO"/>
- <appender-ref ref="EMAIL"/>
</category>
<category name="org.cachebench.reportgenerators">
15 years, 10 months
JBoss Cache SVN: r7752 - in benchmarks/benchmark-fwk/trunk/cache-products/coherence-3.3.1: lib and 1 other directory.
by jbosscache-commits＠lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2009-02-23 07:10:45 -0500 (Mon, 23 Feb 2009)
New Revision: 7752
Added:
benchmarks/benchmark-fwk/trunk/cache-products/coherence-3.3.1/README.txt
Removed:
benchmarks/benchmark-fwk/trunk/cache-products/coherence-3.3.1/lib/README.txt
Log:
Updated Coherence readmes
Copied: benchmarks/benchmark-fwk/trunk/cache-products/coherence-3.3.1/README.txt (from rev 7747, benchmarks/benchmark-fwk/trunk/cache-products/coherence-3.3.1/lib/README.txt)
===================================================================
--- benchmarks/benchmark-fwk/trunk/cache-products/coherence-3.3.1/README.txt (rev 0)
+++ benchmarks/benchmark-fwk/trunk/cache-products/coherence-3.3.1/README.txt 2009-02-23 12:10:45 UTC (rev 7752)
@@ -0,0 +1,7 @@
+Due to licensing restrictions, Coherence JARs cannot be distributed with this benchmark framework. To enable benchmarking
+Coherence, download the Coherence JAR files from Oracle's website:
+
+ http://www.oracle.com/technology/software/products/ias/htdocs/coherence.html
+
+Put the JAR files in the lib/ directory, and then re-run "ant clean all" from the benchmark's root directory to build
+and enable Coherence benchmarking.
Deleted: benchmarks/benchmark-fwk/trunk/cache-products/coherence-3.3.1/lib/README.txt
===================================================================
--- benchmarks/benchmark-fwk/trunk/cache-products/coherence-3.3.1/lib/README.txt 2009-02-23 12:02:42 UTC (rev 7751)
+++ benchmarks/benchmark-fwk/trunk/cache-products/coherence-3.3.1/lib/README.txt 2009-02-23 12:10:45 UTC (rev 7752)
@@ -1 +0,0 @@
-Please download Tangosol Coherence from http://www.tangosol.com/product-downloads.jsp and place jars here.
\ No newline at end of file
15 years, 10 months
JBoss Cache SVN: r7751 - benchmarks/benchmark-fwk/trunk.
by jbosscache-commits＠lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2009-02-23 07:02:42 -0500 (Mon, 23 Feb 2009)
New Revision: 7751
Modified:
benchmarks/benchmark-fwk/trunk/runAllLocal.sh
Log:
Modified: benchmarks/benchmark-fwk/trunk/runAllLocal.sh
===================================================================
--- benchmarks/benchmark-fwk/trunk/runAllLocal.sh 2009-02-23 12:01:28 UTC (rev 7750)
+++ benchmarks/benchmark-fwk/trunk/runAllLocal.sh 2009-02-23 12:02:42 UTC (rev 7751)
@@ -5,8 +5,7 @@
jdk=java5
rm -rf ./output/*
export PLAIN_JVM_OPTIONS="${JVM_OPTIONS} -DcacheBenchFwk.fwkCfgFile=cachebench-local.xml -Xms2g -Xmx2g"
-unset JVM_OPTIONS && export JVM_OPTIONS="${PLAIN_JVM_OPTIONS}"
-./runLocalNode.sh jbosscache-3.0.0 mvcc-local-RR.xml
+unset JVM_OPTIONS && export JVM_OPTIONS="${PLAIN_JVM_OPTIONS} -DcacheBenchFwk.productSuffix=(3.0.3.GA)"
./runLocalNode.sh jbosscache-3.0.0 mvcc-local-RC.xml
./runLocalNode.sh ehcache-1.5.0 ehcache-local.xml
15 years, 10 months
JBoss Cache SVN: r7750 - benchmarks/benchmark-fwk/trunk.
by jbosscache-commits＠lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2009-02-23 07:01:28 -0500 (Mon, 23 Feb 2009)
New Revision: 7750
Removed:
benchmarks/benchmark-fwk/trunk/runAllLocalRC.sh
Log:
Deleted: benchmarks/benchmark-fwk/trunk/runAllLocalRC.sh
===================================================================
--- benchmarks/benchmark-fwk/trunk/runAllLocalRC.sh 2009-02-23 11:58:18 UTC (rev 7749)
+++ benchmarks/benchmark-fwk/trunk/runAllLocalRC.sh 2009-02-23 12:01:28 UTC (rev 7750)
@@ -1,26 +0,0 @@
-#!/bin/bash
-
-# for jdk in java5 java6 java7 ; do
-source java5
-jdk=java5
-rm -rf ./output/*
-export PLAIN_JVM_OPTIONS="${JVM_OPTIONS} -DcacheBenchFwk.fwkCfgFile=cachebench-local.xml -Xms2g -Xmx2g -Xss128k"
-
-unset JVM_OPTIONS && export JVM_OPTIONS="${PLAIN_JVM_OPTIONS} -DcacheBenchFwk.productSuffix=.FLAT"
-./runLocalNode.sh starobrno mvcc-local-RC.xml
-
-unset JVM_OPTIONS && export JVM_OPTIONS="${PLAIN_JVM_OPTIONS} -DcacheBenchFwk.productSuffix=.TREE -Dstarobrno.tree=true"
-./runLocalNode.sh starobrno mvcc-local-RC.xml
-
-unset JVM_OPTIONS && export JVM_OPTIONS="${PLAIN_JVM_OPTIONS}"
-./runLocalNode.sh jbosscache-3.0.0 mvcc-local-RC.xml
-unset JVM_OPTIONS && export JVM_OPTIONS="${PLAIN_JVM_OPTIONS}"
-./runLocalNode.sh ehcache-1.5.0 ehcache-local.xml
-
-mkdir output
-mv data* ./output
-
-./generateChart.sh -reportDir output -o LocalMode-${jdk} -chartType putget
-
-# done
-
15 years, 10 months
JBoss Cache SVN: r7749 - benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/lib.
by jbosscache-commits＠lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2009-02-23 06:58:18 -0500 (Mon, 23 Feb 2009)
New Revision: 7749
Modified:
benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/lib/jbosscache-core.jar
Log:
Updated JBC version
Modified: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/lib/jbosscache-core.jar
===================================================================
(Binary files differ)
15 years, 10 months
JBoss Cache SVN: r7748 - benchmarks/benchmark-fwk/trunk.
by jbosscache-commits＠lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2009-02-23 06:45:38 -0500 (Mon, 23 Feb 2009)
New Revision: 7748
Modified:
benchmarks/benchmark-fwk/trunk/runAllLocal.sh
Log:
Modified: benchmarks/benchmark-fwk/trunk/runAllLocal.sh
===================================================================
--- benchmarks/benchmark-fwk/trunk/runAllLocal.sh 2009-02-23 11:41:39 UTC (rev 7747)
+++ benchmarks/benchmark-fwk/trunk/runAllLocal.sh 2009-02-23 11:45:38 UTC (rev 7748)
@@ -5,15 +5,9 @@
jdk=java5
rm -rf ./output/*
export PLAIN_JVM_OPTIONS="${JVM_OPTIONS} -DcacheBenchFwk.fwkCfgFile=cachebench-local.xml -Xms2g -Xmx2g"
-unset JVM_OPTIONS && export JVM_OPTIONS="${PLAIN_JVM_OPTIONS} -DcacheBenchFwk.productSuffix=.CR7"
-./runLocalNode.sh jbosscache-2.2.0 pess-local-RR.xml
-./runLocalNode.sh jbosscache-2.2.0 pess-local-RC.xml
-unset JVM_OPTIONS && export JVM_OPTIONS="${PLAIN_JVM_OPTIONS} -DcacheBenchFwk.productSuffix=.ALPHA2"
+unset JVM_OPTIONS && export JVM_OPTIONS="${PLAIN_JVM_OPTIONS}"
./runLocalNode.sh jbosscache-3.0.0 mvcc-local-RR.xml
./runLocalNode.sh jbosscache-3.0.0 mvcc-local-RC.xml
-unset JVM_OPTIONS && export JVM_OPTIONS=${PLAIN_JVM_OPTIONS}
-./runLocalNode.sh jbosscache-2.1.0 pess-local-RR.xml
-./runLocalNode.sh jbosscache-2.1.0 pess-local-RC.xml
./runLocalNode.sh ehcache-1.5.0 ehcache-local.xml
mkdir output
15 years, 10 months
JBoss Cache SVN: r7747 - in core/branches/3.0.X: src/main/java/org/jboss/cache and 1 other directory.
by jbosscache-commits＠lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2009-02-23 06:41:39 -0500 (Mon, 23 Feb 2009)
New Revision: 7747
Modified:
core/branches/3.0.X/pom.xml
core/branches/3.0.X/release.sh
core/branches/3.0.X/src/main/java/org/jboss/cache/Version.java
Log:
Updated version
Modified: core/branches/3.0.X/pom.xml
===================================================================
--- core/branches/3.0.X/pom.xml 2009-02-23 11:37:17 UTC (rev 7746)
+++ core/branches/3.0.X/pom.xml 2009-02-23 11:41:39 UTC (rev 7747)
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<properties>
- <jbosscache-core-version>3.0.3-SNAPSHOT</jbosscache-core-version>
+ <jbosscache-core-version>3.0.4-SNAPSHOT</jbosscache-core-version>
<!-- By default only run tests in the "unit" group -->
<defaultTestGroup>unit</defaultTestGroup>
<!-- By default only generate Javadocs when we install the module. -->
Modified: core/branches/3.0.X/release.sh
===================================================================
--- core/branches/3.0.X/release.sh 2009-02-23 11:37:17 UTC (rev 7746)
+++ core/branches/3.0.X/release.sh 2009-02-23 11:41:39 UTC (rev 7747)
@@ -106,9 +106,9 @@
validate
tag
setVersion
-build
-checkIntoRepository
-docs
+#build
+#checkIntoRepository
+#docs
echo 'Done! Now all you need to do is:'
echo ' 1. Update the website (http://www.jbosscache.org)'
echo ' 2. Update wiki pages (main wiki page, docs and download)'
Modified: core/branches/3.0.X/src/main/java/org/jboss/cache/Version.java
===================================================================
--- core/branches/3.0.X/src/main/java/org/jboss/cache/Version.java 2009-02-23 11:37:17 UTC (rev 7746)
+++ core/branches/3.0.X/src/main/java/org/jboss/cache/Version.java 2009-02-23 11:41:39 UTC (rev 7747)
@@ -31,10 +31,10 @@
*/
@Immutable
public class Version {
- public static final String version = "3.0.3-SNAPSHOT";
+ public static final String version = "3.0.4-SNAPSHOT";
public static final String codename = "Naga";
//public static final String cvs = "$Id$";
- static final byte[] version_id = {'0', '3', '0', '3', 'S'};
+ static final byte[] version_id = {'0', '3', '0', '4', 'S'};
private static final int MAJOR_SHIFT = 11;
private static final int MINOR_SHIFT = 6;
15 years, 10 months
JBoss Cache SVN: r7746 - core/tags/3.0.3.GA/src/test/java/org/jboss/cache/marshall.
by jbosscache-commits＠lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2009-02-23 06:37:17 -0500 (Mon, 23 Feb 2009)
New Revision: 7746
Modified:
core/tags/3.0.3.GA/src/test/java/org/jboss/cache/marshall/VersionAwareMarshallerTest.java
Log:
Modified: core/tags/3.0.3.GA/src/test/java/org/jboss/cache/marshall/VersionAwareMarshallerTest.java
===================================================================
--- core/tags/3.0.3.GA/src/test/java/org/jboss/cache/marshall/VersionAwareMarshallerTest.java 2009-02-22 21:36:35 UTC (rev 7745)
+++ core/tags/3.0.3.GA/src/test/java/org/jboss/cache/marshall/VersionAwareMarshallerTest.java 2009-02-23 11:37:17 UTC (rev 7746)
@@ -78,7 +78,7 @@
byte[] bytes = marshaller.objectToByteBuffer("Hello");
ObjectInputStream in = new MarshalledValueInputStream(new ByteArrayInputStream(bytes));
- assertEquals("Version header short should be '30'", 31, in.readShort());
+ assertEquals("Version header short should be '30'", 30, in.readShort());
}
public void testVersionHeader210() throws Exception
15 years, 10 months
JBoss Cache SVN: r7745 - core/support-branches/1.4.1.SP8_JBCACHE-1247_JBCACHE-1483/src/org/jboss/cache.
by jbosscache-commits＠lists.jboss.org
Author: jiwils
Date: 2009-02-22 16:36:35 -0500 (Sun, 22 Feb 2009)
New Revision: 7745
Modified:
core/support-branches/1.4.1.SP8_JBCACHE-1247_JBCACHE-1483/src/org/jboss/cache/TreeCache.java
Log:
Fix for JBCACHE-1483. findNode now handles null returned from findInternal.
Modified: core/support-branches/1.4.1.SP8_JBCACHE-1247_JBCACHE-1483/src/org/jboss/cache/TreeCache.java
===================================================================
--- core/support-branches/1.4.1.SP8_JBCACHE-1247_JBCACHE-1483/src/org/jboss/cache/TreeCache.java 2009-02-22 21:33:55 UTC (rev 7744)
+++ core/support-branches/1.4.1.SP8_JBCACHE-1247_JBCACHE-1483/src/org/jboss/cache/TreeCache.java 2009-02-22 21:36:35 UTC (rev 7745)
@@ -112,8 +112,8 @@
private static final String JGROUPS_JMX_DOMAIN = "jboss.jgroups";
private static final String CHANNEL_JMX_ATTRIBUTES = "type=channel,cluster=";
private static final String PROTOCOL_JMX_ATTRIBUTES = "type=protocol,cluster=";
-
-
+
+
private boolean forceAnycast = false;
/**
* Default replication version, from {@link Version#getVersionShort}.
@@ -284,7 +284,7 @@
* Require write locks on parents before adding or removing children. Default false.
*/
protected boolean lockParentForChildInsertRemove = false;
-
+
/**
* This ThreadLocal contains an {@see InvocationContext} object, which holds
* invocation-specific details.
@@ -435,15 +435,15 @@
* will be ignored by _getState().
*/
protected final Set activationChangeNodes = new HashSet();
-
+
/**
- * The JGroups 2.4.1 or higher "callRemoteMethods" overload that
+ * The JGroups 2.4.1 or higher "callRemoteMethods" overload that
* provides Anycast support.
*/
protected Method anycastMethod;
-
+
/** Did we register our channel in JMX ourself? */
- protected boolean channelRegistered;
+ protected boolean channelRegistered;
/** Did we register our channel's protocols in JMX ourself? */
protected boolean protocolsRegistered;
@@ -1125,7 +1125,7 @@
public IsolationLevel getIsolationLevelClass()
{
return isolationLevel;
- }
+ }
/**
* Gets whether inserting or removing a node requires a write lock
@@ -1474,7 +1474,7 @@
channel = new JChannel(cluster_props);
// JBCACHE-1048 Hack to register the channel
registerChannelInJmx();
-
+
// Only set GET_STATE_EVENTS if the JGroups version is < 2.3
int jgVer= org.jgroups.Version.version;
while (jgVer >= 100)
@@ -1497,7 +1497,7 @@
*/
disp = new RpcDispatcher(channel, ml, this, this);
disp.setMarshaller(getMarshaller());
-
+
// See if Anycast is supported
try
{
@@ -1505,7 +1505,7 @@
}
catch (Throwable ignored)
{
- log.debug("JGroups release " + org.jgroups.Version.version +
+ log.debug("JGroups release " + org.jgroups.Version.version +
" does not support anycast; will not use it");
}
break;
@@ -1989,13 +1989,13 @@
{
// Get the state from each DataOwner and integrate in their
// respective buddy backup tree
- List buddies = buddyManager.getBackupDataOwners();
+ List buddies = buddyManager.getBackupDataOwners();
for (Iterator it = buddies.iterator(); it.hasNext();)
{
Address buddy = (Address) it.next();
if (getMembers() == null || !getMembers().contains(buddy))
continue;
-
+
Object[] sources = {buddy};
Fqn base = new Fqn(BuddyManager.BUDDY_BACKUP_SUBTREE_FQN, BuddyManager.getGroupNameFromAddress(buddy));
Fqn buddyRoot = new Fqn(base, fqn);
@@ -3362,7 +3362,7 @@
// No one provided us with state. We need to find out if that's because
// we are the coordinator. But we don't know if the viewAccepted() callback
// has been invoked, so call determineCoordinator(), which will block until
- // viewAccepted() is called at least once
+ // viewAccepted() is called at least once
determineCoordinator();
if (isCoordinator())
@@ -5071,16 +5071,16 @@
* Internal evict method called by eviction policy provider.
*
* @param fqn removes everything assoicated with this FQN
- *
- * @return <code>true</code> if the node has been completely removed,
+ *
+ * @return <code>true</code> if the node has been completely removed,
* <code>false</code> if only the data map was removed, due
* to the presence of children
- *
+ *
* @throws CacheException
*/
public boolean _evict(Fqn fqn) throws CacheException
{
- if (!exists(fqn))
+ if (!exists(fqn))
return true; // node does not exist. Maybe it has been recursively removed.
// use remove method now if there is a child node. Otherwise, it is removed
boolean create_undo_ops = false;
@@ -5105,16 +5105,16 @@
*
* @param fqn
* @param version
- *
- * @return <code>true</code> if the node has been completely removed,
+ *
+ * @return <code>true</code> if the node has been completely removed,
* <code>false</code> if only the data map was removed, due
* to the presence of children
- *
+ *
* @throws CacheException
*/
public boolean _evict(Fqn fqn, DataVersion version) throws CacheException
{
- if (!exists(fqn))
+ if (!exists(fqn))
return true; // node does not exist
boolean create_undo_ops = false;
@@ -5745,7 +5745,7 @@
// Now that we have a view, figure out if we are the coordinator
coordinator = (members.size() != 0 && members.get(0).equals(getLocalAddress()));
- // now notify listeners - *after* updating the coordinator. - JBCACHE-662
+ // now notify listeners - *after* updating the coordinator. - JBCACHE-662
if (needNotification) notifyViewChange(new_view);
// Wake up any threads that are waiting to know who the members
@@ -5852,7 +5852,7 @@
catch (SystemException e)
{
}
-
+
// JBCACHE-982 -- don't complain if COMMITTED
if (status != Status.STATUS_COMMITTED)
{
@@ -5862,7 +5862,7 @@
{
log.trace("status is COMMITTED; returning null");
}
-
+
return null;
}
@@ -5999,7 +5999,7 @@
Node toReturn = findInternal(fqn, false);
- if (version != null)
+ if (toReturn != null && version != null)
{
// we need to check the version of the data node...
DataVersion nodeVersion = ((OptimisticTreeNode) toReturn).getVersion();
@@ -6294,7 +6294,7 @@
if (curr == null) return;
notifyNodeCreated(curr.getFqn());
-
+
if ((children = curr.getChildren()) != null)
{
for (Iterator it = children.values().iterator(); it.hasNext();)
@@ -6702,7 +6702,7 @@
return (MBeanServer) servers.get(0);
}
-
+
protected void registerChannelInJmx()
{
if (server != null)
@@ -6712,7 +6712,7 @@
String protocolPrefix = JGROUPS_JMX_DOMAIN + ":" + PROTOCOL_JMX_ATTRIBUTES + getClusterName();
JmxConfigurator.registerProtocols(server, channel, protocolPrefix);
protocolsRegistered = true;
-
+
String name = JGROUPS_JMX_DOMAIN + ":" + CHANNEL_JMX_ATTRIBUTES + getClusterName();
JmxConfigurator.registerChannel(channel, server, name);
channelRegistered = true;
@@ -6723,12 +6723,12 @@
}
}
}
-
+
protected void unregisterChannelFromJmx()
{
ObjectName on = null;
if (channelRegistered)
- {
+ {
// Unregister the channel itself
try
{
@@ -6743,7 +6743,7 @@
log.error("Caught exception unregistering channel", e);
}
}
-
+
if (protocolsRegistered)
{
// Unregister the protocols
15 years, 10 months