May 2010 - jbosscache-commits - Jboss List Archives

JBoss Cache SVN: r8403 - in core/tags/3.2.5.GA: src/main/java/org/jboss/cache and 1 other directory.

by jbosscache-commits＠lists.jboss.org

Author: manik.surtani(a)jboss.com Date: 2010-05-10 10:29:46 -0400 (Mon, 10 May 2010) New Revision: 8403 Modified: core/tags/3.2.5.GA/pom.xml core/tags/3.2.5.GA/src/main/java/org/jboss/cache/Version.java Log: JBoss Cache Release Script: Updating 3.2.5.GA Modified: core/tags/3.2.5.GA/pom.xml =================================================================== --- core/tags/3.2.5.GA/pom.xml 2010-05-10 14:27:06 UTC (rev 8402) +++ core/tags/3.2.5.GA/pom.xml 2010-05-10 14:29:46 UTC (rev 8403) @@ -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.2.5-SNAPSHOT</jbosscache-core-version> + <jbosscache-core-version>3.2.5.GA</jbosscache-core-version>  <defaultTestGroup>unit</defaultTestGroup>  @@ -471,7 +471,7 @@ <activeByDefault>false</activeByDefault> </activation> <properties> - <jbosscache-core-version>3.2.1-SNAPSHOT-JBossAS</jbosscache-core-version> + <jbosscache-core-version>3.2.5.GA-JBossAS</jbosscache-core-version> <defaultTestGroup>functional,unit</defaultTestGroup> <protocol.stack>tcp</protocol.stack> </properties> Modified: core/tags/3.2.5.GA/src/main/java/org/jboss/cache/Version.java =================================================================== --- core/tags/3.2.5.GA/src/main/java/org/jboss/cache/Version.java 2010-05-10 14:27:06 UTC (rev 8402) +++ core/tags/3.2.5.GA/src/main/java/org/jboss/cache/Version.java 2010-05-10 14:29:46 UTC (rev 8403) @@ -32,10 +32,10 @@ @Immutable public class Version { - public static final String version = "3.2.1-SNAPSHOT"; + public static final String version = "3.2.5.GA"; public static final String codename = "Malagueta"; //public static final String cvs = "$Id$"; - static final byte[] version_id = {'0', '3', '2', '1', 'S'}; + static final byte[] version_id = {'0','3','2','5','G','A'}; private static final int MAJOR_SHIFT = 11; private static final int MINOR_SHIFT = 6;

13 years, 11 months

1
0
0 / 0

JBoss Cache SVN: r8402 - core/tags.

by jbosscache-commits＠lists.jboss.org

Author: manik.surtani(a)jboss.com Date: 2010-05-10 10:27:06 -0400 (Mon, 10 May 2010) New Revision: 8402 Added: core/tags/3.2.5.GA/ Log: JBoss Cache Release Script: Tagging 3.2.5.GA Copied: core/tags/3.2.5.GA (from rev 8401, core/trunk)

13 years, 11 months

1
0
0 / 0

JBoss Cache SVN: r8401 - core/trunk.

by jbosscache-commits＠lists.jboss.org

Author: manik.surtani(a)jboss.com Date: 2010-05-10 06:31:40 -0400 (Mon, 10 May 2010) New Revision: 8401 Modified: core/trunk/pom.xml Log: Fixed pom Modified: core/trunk/pom.xml =================================================================== --- core/trunk/pom.xml 2010-05-08 20:30:47 UTC (rev 8400) +++ core/trunk/pom.xml 2010-05-10 10:31:40 UTC (rev 8401) @@ -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.2.4-SNAPSHOT</jbosscache-core-version> + <jbosscache-core-version>3.2.5-SNAPSHOT</jbosscache-core-version>  <defaultTestGroup>unit</defaultTestGroup>  @@ -236,6 +236,14 @@ </plugins> </reporting> + <repositories> +  + <repository> + <id>berkeleydb-je.repository</id> + <url>http://download.oracle.com/maven/</url> + </repository> + </repositories> + <profiles> <profile>

13 years, 11 months

1
0
0 / 0

Hudson build is back to Hudson build completed : jboss-cache-core-trunk-jdk1.5 » JBoss Cache - Core Edition #888

by jboss-qa-internal＠redhat.com

See <http://hudson.qa.jboss.com/hudson/job/jboss-cache-core-trunk-jdk1.5/org.j...>

13 years, 11 months

1
0
0 / 0

Build failed in Hudson: jboss-cache-core-trunk-jdk1.6 #799

by jboss-qa-internal＠redhat.com

See <http://hudson.qa.jboss.com/hudson/job/jboss-cache-core-trunk-jdk1.6/799/> ------------------------------------------ Started by user admin Building remotely on soa4-rhel5-x86_64 Checking out https://svn.jboss.org/repos/jbosscache/core/trunk ERROR: Failed to check out https://svn.jboss.org/repos/jbosscache/core/trunk org.tmatesoft.svn.core.SVNCancelException: svn: authentication cancelled at org.tmatesoft.svn.core.internal.wc.SVNErrorManager.cancel(SVNErrorManager.java:37) at org.tmatesoft.svn.core.internal.wc.SVNErrorManager.cancel(SVNErrorManager.java:32) at org.tmatesoft.svn.core.internal.wc.DefaultSVNAuthenticationManager.getNextAuthentication(DefaultSVNAuthenticationManager.java:200) at org.tmatesoft.svn.core.internal.io.dav.http.HTTPConnection.request(HTTPConnection.java:537) at org.tmatesoft.svn.core.internal.io.dav.http.HTTPConnection.request(HTTPConnection.java:273) at org.tmatesoft.svn.core.internal.io.dav.http.HTTPConnection.request(HTTPConnection.java:261) at org.tmatesoft.svn.core.internal.io.dav.DAVConnection.exchangeCapabilities(DAVConnection.java:516) at org.tmatesoft.svn.core.internal.io.dav.DAVConnection.open(DAVConnection.java:98) at org.tmatesoft.svn.core.internal.io.dav.DAVRepository.openConnection(DAVRepository.java:1001) at org.tmatesoft.svn.core.internal.io.dav.DAVRepository.getLatestRevision(DAVRepository.java:178) at org.tmatesoft.svn.core.wc.SVNBasicClient.getRevisionNumber(SVNBasicClient.java:482) at org.tmatesoft.svn.core.wc.SVNBasicClient.getLocations(SVNBasicClient.java:851) at org.tmatesoft.svn.core.wc.SVNBasicClient.createRepository(SVNBasicClient.java:534) at org.tmatesoft.svn.core.wc.SVNUpdateClient.doCheckout(SVNUpdateClient.java:893) at hudson.scm.SubversionSCM$CheckOutTask.invoke(SubversionSCM.java:675) at hudson.scm.SubversionSCM$CheckOutTask.invoke(SubversionSCM.java:595) at hudson.FilePath$FileCallableWrapper.call(FilePath.java:1962) at hudson.remoting.UserRequest.perform(UserRequest.java:104) at hudson.remoting.UserRequest.perform(UserRequest.java:48) at hudson.remoting.Request$2.run(Request.java:270) at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:441) at java.util.concurrent.FutureTask$Sync.innerRun(FutureTask.java:303) at java.util.concurrent.FutureTask.run(FutureTask.java:138) at java.util.concurrent.ThreadPoolExecutor$Worker.runTask(ThreadPoolExecutor.java:886) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:908) at java.lang.Thread.run(Thread.java:619) Retrying after 10 seconds Checking out https://svn.jboss.org/repos/jbosscache/core/trunk ERROR: Failed to check out https://svn.jboss.org/repos/jbosscache/core/trunk org.tmatesoft.svn.core.SVNCancelException: svn: authentication cancelled at org.tmatesoft.svn.core.internal.wc.SVNErrorManager.cancel(SVNErrorManager.java:37) at org.tmatesoft.svn.core.internal.wc.SVNErrorManager.cancel(SVNErrorManager.java:32) at org.tmatesoft.svn.core.internal.wc.DefaultSVNAuthenticationManager.getNextAuthentication(DefaultSVNAuthenticationManager.java:200) at org.tmatesoft.svn.core.internal.io.dav.http.HTTPConnection.request(HTTPConnection.java:537) at org.tmatesoft.svn.core.internal.io.dav.http.HTTPConnection.request(HTTPConnection.java:273) at org.tmatesoft.svn.core.internal.io.dav.http.HTTPConnection.request(HTTPConnection.java:261) at org.tmatesoft.svn.core.internal.io.dav.DAVConnection.exchangeCapabilities(DAVConnection.java:516) at org.tmatesoft.svn.core.internal.io.dav.DAVConnection.open(DAVConnection.java:98) at org.tmatesoft.svn.core.internal.io.dav.DAVRepository.openConnection(DAVRepository.java:1001) at org.tmatesoft.svn.core.internal.io.dav.DAVRepository.getLatestRevision(DAVRepository.java:178) at org.tmatesoft.svn.core.wc.SVNBasicClient.getRevisionNumber(SVNBasicClient.java:482) at org.tmatesoft.svn.core.wc.SVNBasicClient.getLocations(SVNBasicClient.java:851) at org.tmatesoft.svn.core.wc.SVNBasicClient.createRepository(SVNBasicClient.java:534) at org.tmatesoft.svn.core.wc.SVNUpdateClient.doCheckout(SVNUpdateClient.java:893) at hudson.scm.SubversionSCM$CheckOutTask.invoke(SubversionSCM.java:675) at hudson.scm.SubversionSCM$CheckOutTask.invoke(SubversionSCM.java:595) at hudson.FilePath$FileCallableWrapper.call(FilePath.java:1962) at hudson.remoting.UserRequest.perform(UserRequest.java:104) at hudson.remoting.UserRequest.perform(UserRequest.java:48) at hudson.remoting.Request$2.run(Request.java:270) at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:441) at java.util.concurrent.FutureTask$Sync.innerRun(FutureTask.java:303) at java.util.concurrent.FutureTask.run(FutureTask.java:138) at java.util.concurrent.ThreadPoolExecutor$Worker.runTask(ThreadPoolExecutor.java:886) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:908) at java.lang.Thread.run(Thread.java:619) Retrying after 10 seconds Checking out https://svn.jboss.org/repos/jbosscache/core/trunk ERROR: Failed to check out https://svn.jboss.org/repos/jbosscache/core/trunk org.tmatesoft.svn.core.SVNCancelException: svn: authentication cancelled at org.tmatesoft.svn.core.internal.wc.SVNErrorManager.cancel(SVNErrorManager.java:37) at org.tmatesoft.svn.core.internal.wc.SVNErrorManager.cancel(SVNErrorManager.java:32) at org.tmatesoft.svn.core.internal.wc.DefaultSVNAuthenticationManager.getNextAuthentication(DefaultSVNAuthenticationManager.java:200) at org.tmatesoft.svn.core.internal.io.dav.http.HTTPConnection.request(HTTPConnection.java:537) at org.tmatesoft.svn.core.internal.io.dav.http.HTTPConnection.request(HTTPConnection.java:273) at org.tmatesoft.svn.core.internal.io.dav.http.HTTPConnection.request(HTTPConnection.java:261) at org.tmatesoft.svn.core.internal.io.dav.DAVConnection.exchangeCapabilities(DAVConnection.java:516) at org.tmatesoft.svn.core.internal.io.dav.DAVConnection.open(DAVConnection.java:98) at org.tmatesoft.svn.core.internal.io.dav.DAVRepository.openConnection(DAVRepository.java:1001) at org.tmatesoft.svn.core.internal.io.dav.DAVRepository.getLatestRevision(DAVRepository.java:178) at org.tmatesoft.svn.core.wc.SVNBasicClient.getRevisionNumber(SVNBasicClient.java:482) at org.tmatesoft.svn.core.wc.SVNBasicClient.getLocations(SVNBasicClient.java:851) at org.tmatesoft.svn.core.wc.SVNBasicClient.createRepository(SVNBasicClient.java:534) at org.tmatesoft.svn.core.wc.SVNUpdateClient.doCheckout(SVNUpdateClient.java:893) at hudson.scm.SubversionSCM$CheckOutTask.invoke(SubversionSCM.java:675) at hudson.scm.SubversionSCM$CheckOutTask.invoke(SubversionSCM.java:595) at hudson.FilePath$FileCallableWrapper.call(FilePath.java:1962) at hudson.remoting.UserRequest.perform(UserRequest.java:104) at hudson.remoting.UserRequest.perform(UserRequest.java:48) at hudson.remoting.Request$2.run(Request.java:270) at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:441) at java.util.concurrent.FutureTask$Sync.innerRun(FutureTask.java:303) at java.util.concurrent.FutureTask.run(FutureTask.java:138) at java.util.concurrent.ThreadPoolExecutor$Worker.runTask(ThreadPoolExecutor.java:886) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:908) at java.lang.Thread.run(Thread.java:619) Retrying after 10 seconds Checking out https://svn.jboss.org/repos/jbosscache/core/trunk ERROR: Failed to check out https://svn.jboss.org/repos/jbosscache/core/trunk org.tmatesoft.svn.core.SVNCancelException: svn: authentication cancelled at org.tmatesoft.svn.core.internal.wc.SVNErrorManager.cancel(SVNErrorManager.java:37) at org.tmatesoft.svn.core.internal.wc.SVNErrorManager.cancel(SVNErrorManager.java:32) at org.tmatesoft.svn.core.internal.wc.DefaultSVNAuthenticationManager.getNextAuthentication(DefaultSVNAuthenticationManager.java:200) at org.tmatesoft.svn.core.internal.io.dav.http.HTTPConnection.request(HTTPConnection.java:537) at org.tmatesoft.svn.core.internal.io.dav.http.HTTPConnection.request(HTTPConnection.java:273) at org.tmatesoft.svn.core.internal.io.dav.http.HTTPConnection.request(HTTPConnection.java:261) at org.tmatesoft.svn.core.internal.io.dav.DAVConnection.exchangeCapabilities(DAVConnection.java:516) at org.tmatesoft.svn.core.internal.io.dav.DAVConnection.open(DAVConnection.java:98) at org.tmatesoft.svn.core.internal.io.dav.DAVRepository.openConnection(DAVRepository.java:1001) at org.tmatesoft.svn.core.internal.io.dav.DAVRepository.getLatestRevision(DAVRepository.java:178) at org.tmatesoft.svn.core.wc.SVNBasicClient.getRevisionNumber(SVNBasicClient.java:482) at org.tmatesoft.svn.core.wc.SVNBasicClient.getLocations(SVNBasicClient.java:851) at org.tmatesoft.svn.core.wc.SVNBasicClient.createRepository(SVNBasicClient.java:534) at org.tmatesoft.svn.core.wc.SVNUpdateClient.doCheckout(SVNUpdateClient.java:893) at hudson.scm.SubversionSCM$CheckOutTask.invoke(SubversionSCM.java:675) at hudson.scm.SubversionSCM$CheckOutTask.invoke(SubversionSCM.java:595) at hudson.FilePath$FileCallableWrapper.call(FilePath.java:1962) at hudson.remoting.UserRequest.perform(UserRequest.java:104) at hudson.remoting.UserRequest.perform(UserRequest.java:48) at hudson.remoting.Request$2.run(Request.java:270) at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:441) at java.util.concurrent.FutureTask$Sync.innerRun(FutureTask.java:303) at java.util.concurrent.FutureTask.run(FutureTask.java:138) at java.util.concurrent.ThreadPoolExecutor$Worker.runTask(ThreadPoolExecutor.java:886) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:908) at java.lang.Thread.run(Thread.java:619) Retrying after 10 seconds Checking out https://svn.jboss.org/repos/jbosscache/core/trunk ERROR: Failed to check out https://svn.jboss.org/repos/jbosscache/core/trunk org.tmatesoft.svn.core.SVNCancelException: svn: authentication cancelled at org.tmatesoft.svn.core.internal.wc.SVNErrorManager.cancel(SVNErrorManager.java:37) at org.tmatesoft.svn.core.internal.wc.SVNErrorManager.cancel(SVNErrorManager.java:32) at org.tmatesoft.svn.core.internal.wc.DefaultSVNAuthenticationManager.getNextAuthentication(DefaultSVNAuthenticationManager.java:200) at org.tmatesoft.svn.core.internal.io.dav.http.HTTPConnection.request(HTTPConnection.java:537) at org.tmatesoft.svn.core.internal.io.dav.http.HTTPConnection.request(HTTPConnection.java:273) at org.tmatesoft.svn.core.internal.io.dav.http.HTTPConnection.request(HTTPConnection.java:261) at org.tmatesoft.svn.core.internal.io.dav.DAVConnection.exchangeCapabilities(DAVConnection.java:516) at org.tmatesoft.svn.core.internal.io.dav.DAVConnection.open(DAVConnection.java:98) at org.tmatesoft.svn.core.internal.io.dav.DAVRepository.openConnection(DAVRepository.java:1001) at org.tmatesoft.svn.core.internal.io.dav.DAVRepository.getLatestRevision(DAVRepository.java:178) at org.tmatesoft.svn.core.wc.SVNBasicClient.getRevisionNumber(SVNBasicClient.java:482) at org.tmatesoft.svn.core.wc.SVNBasicClient.getLocations(SVNBasicClient.java:851) at org.tmatesoft.svn.core.wc.SVNBasicClient.createRepository(SVNBasicClient.java:534) at org.tmatesoft.svn.core.wc.SVNUpdateClient.doCheckout(SVNUpdateClient.java:893) at hudson.scm.SubversionSCM$CheckOutTask.invoke(SubversionSCM.java:675) at hudson.scm.SubversionSCM$CheckOutTask.invoke(SubversionSCM.java:595) at hudson.FilePath$FileCallableWrapper.call(FilePath.java:1962) at hudson.remoting.UserRequest.perform(UserRequest.java:104) at hudson.remoting.UserRequest.perform(UserRequest.java:48) at hudson.remoting.Request$2.run(Request.java:270) at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:441) at java.util.concurrent.FutureTask$Sync.innerRun(FutureTask.java:303) at java.util.concurrent.FutureTask.run(FutureTask.java:138) at java.util.concurrent.ThreadPoolExecutor$Worker.runTask(ThreadPoolExecutor.java:886) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:908) at java.lang.Thread.run(Thread.java:619) Retrying after 10 seconds Checking out https://svn.jboss.org/repos/jbosscache/core/trunk ERROR: Failed to check out https://svn.jboss.org/repos/jbosscache/core/trunk org.tmatesoft.svn.core.SVNCancelException: svn: authentication cancelled at org.tmatesoft.svn.core.internal.wc.SVNErrorManager.cancel(SVNErrorManager.java:37) at org.tmatesoft.svn.core.internal.wc.SVNErrorManager.cancel(SVNErrorManager.java:32) at org.tmatesoft.svn.core.internal.wc.DefaultSVNAuthenticationManager.getNextAuthentication(DefaultSVNAuthenticationManager.java:200) at org.tmatesoft.svn.core.internal.io.dav.http.HTTPConnection.request(HTTPConnection.java:537) at org.tmatesoft.svn.core.internal.io.dav.http.HTTPConnection.request(HTTPConnection.java:273) at org.tmatesoft.svn.core.internal.io.dav.http.HTTPConnection.request(HTTPConnection.java:261) at org.tmatesoft.svn.core.internal.io.dav.DAVConnection.exchangeCapabilities(DAVConnection.java:516) at org.tmatesoft.svn.core.internal.io.dav.DAVConnection.open(DAVConnection.java:98) at org.tmatesoft.svn.core.internal.io.dav.DAVRepository.openConnection(DAVRepository.java:1001) at org.tmatesoft.svn.core.internal.io.dav.DAVRepository.getLatestRevision(DAVRepository.java:178) at org.tmatesoft.svn.core.wc.SVNBasicClient.getRevisionNumber(SVNBasicClient.java:482) at org.tmatesoft.svn.core.wc.SVNBasicClient.getLocations(SVNBasicClient.java:851) at org.tmatesoft.svn.core.wc.SVNBasicClient.createRepository(SVNBasicClient.java:534) at org.tmatesoft.svn.core.wc.SVNUpdateClient.doCheckout(SVNUpdateClient.java:893) at hudson.scm.SubversionSCM$CheckOutTask.invoke(SubversionSCM.java:675) at hudson.scm.SubversionSCM$CheckOutTask.invoke(SubversionSCM.java:595) at hudson.FilePath$FileCallableWrapper.call(FilePath.java:1962) at hudson.remoting.UserRequest.perform(UserRequest.java:104) at hudson.remoting.UserRequest.perform(UserRequest.java:48) at hudson.remoting.Request$2.run(Request.java:270) at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:441) at java.util.concurrent.FutureTask$Sync.innerRun(FutureTask.java:303) at java.util.concurrent.FutureTask.run(FutureTask.java:138) at java.util.concurrent.ThreadPoolExecutor$Worker.runTask(ThreadPoolExecutor.java:886) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:908) at java.lang.Thread.run(Thread.java:619)

13 years, 11 months

1
5
0 / 0

Hudson build became unstable: jboss-cache-core-trunk-jdk1.6 » JBoss Cache - Core Edition #803

by jboss-qa-internal＠redhat.com

See <http://hudson.qa.jboss.com/hudson/job/jboss-cache-core-trunk-jdk1.6/org.j...>

13 years, 11 months

1
1
0 / 0

JBoss Cache SVN: r8400 - in core/trunk/src/main/java/org/jboss/cache: interceptors and 1 other directory.

by jbosscache-commits＠lists.jboss.org

Author: bstansberry(a)jboss.com Date: 2010-05-08 16:30:47 -0400 (Sat, 08 May 2010) New Revision: 8400 Modified: core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyFqnTransformer.java core/trunk/src/main/java/org/jboss/cache/interceptors/CacheLoaderInterceptor.java core/trunk/src/main/java/org/jboss/cache/interceptors/CacheStoreInterceptor.java core/trunk/src/main/java/org/jboss/cache/interceptors/LegacyCacheLoaderInterceptor.java Log: [JBCACHE-1580] Ensure names of dead member backup node children are type Integer Modified: core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyFqnTransformer.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyFqnTransformer.java 2010-05-05 09:01:58 UTC (rev 8399) +++ core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyFqnTransformer.java 2010-05-08 20:30:47 UTC (rev 8400) @@ -26,7 +26,9 @@ import org.jgroups.Address; import java.util.ArrayList; +import java.util.HashSet; import java.util.List; +import java.util.Set; /** * Knows how to transform between fqn and buddy-formated fqns. @@ -176,4 +178,25 @@ return Fqn.root(); } } + + /** + * Takes a set of names that represent the children of a + * {@link #isDeadBackupRoot(Fqn) dead backup root} and ensure they are + * all of the expected type, tranforming any that are not. See JBCACHE-1580. + * + * + * @param children names that represent the children of a dead backup root node + * + * @return set, based on <code>names</code> whose members are all of the + * expected type. + */ + public Set<?> getDeadBackupRootChildren(Set<?> children) + { + Set<Integer> result = new HashSet<Integer>(children.size()); + for (Object child : children) + { + result.add((child instanceof Integer ? (Integer) child : Integer.valueOf(child.toString()))); + } + return result; + } } Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/CacheLoaderInterceptor.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/interceptors/CacheLoaderInterceptor.java 2010-05-05 09:01:58 UTC (rev 8399) +++ core/trunk/src/main/java/org/jboss/cache/interceptors/CacheLoaderInterceptor.java 2010-05-08 20:30:47 UTC (rev 8400) @@ -27,6 +27,7 @@ import org.jboss.cache.InternalNode; import org.jboss.cache.InvocationContext; import org.jboss.cache.NodeSPI; +import org.jboss.cache.buddyreplication.BuddyFqnTransformer; import org.jboss.cache.commands.read.GetChildrenNamesCommand; import org.jboss.cache.commands.read.GetDataMapCommand; import org.jboss.cache.commands.read.GetKeyValueCommand; @@ -82,6 +83,7 @@ // protected boolean usingVersionedInvalidation = false; protected MVCCNodeHelper helper; + protected BuddyFqnTransformer buddyFqnTransformer; /** @@ -93,7 +95,8 @@ @Inject protected void injectDependencies(TransactionTable txTable, CacheLoaderManager clm, Configuration configuration, - DataContainer dataContainer, Notifier notifier, MVCCNodeHelper helper) + DataContainer dataContainer, Notifier notifier, MVCCNodeHelper helper, + BuddyFqnTransformer buddyFqnTransformer) { this.txTable = txTable; this.clm = clm; @@ -383,6 +386,14 @@ } return; } + + // The children of a dead buddy backup root must be Integer. + // Ensure that we didn't pull in the wrong type from a cache loader + // (e.g. FileCacheLoader) that can only return String + if (buddyFqnTransformer != null && buddyFqnTransformer.isDeadBackupRoot(fqn)) + { + childrenNames = buddyFqnTransformer.getDeadBackupRootChildren(childrenNames); + } // Create if node had not been created already if (node == null) Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/CacheStoreInterceptor.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/interceptors/CacheStoreInterceptor.java 2010-05-05 09:01:58 UTC (rev 8399) +++ core/trunk/src/main/java/org/jboss/cache/interceptors/CacheStoreInterceptor.java 2010-05-08 20:30:47 UTC (rev 8400) @@ -26,6 +26,7 @@ import org.jboss.cache.InvocationContext; import org.jboss.cache.Modification; import org.jboss.cache.NodeSPI; +import org.jboss.cache.buddyreplication.BuddyFqnTransformer; import org.jboss.cache.commands.AbstractVisitor; import org.jboss.cache.commands.VisitableCommand; import org.jboss.cache.commands.WriteCommand; @@ -77,6 +78,7 @@ CacheLoader loader; private CacheLoaderManager loaderManager; private boolean statsEnabled; + private BuddyFqnTransformer buddyFqnTransformer; public CacheStoreInterceptor() { @@ -85,7 +87,8 @@ } @Inject - protected void init(CacheLoaderManager loaderManager, TransactionManager txManager, CacheLoaderConfig clConfig) + protected void init(CacheLoaderManager loaderManager, TransactionManager txManager, CacheLoaderConfig clConfig, + BuddyFqnTransformer buddyFqnTransformer) { // never inject a CacheLoader at this stage - only a CacheLoaderManager, since the CacheLoaderManager only creates a CacheLoader instance when it @Starts. this.loaderManager = loaderManager; @@ -309,7 +312,15 @@ //recurse Set childrenNames = loader.getChildrenNames(fqn); if (childrenNames != null) - { + { + // The children of a dead buddy backup root must be Integer. + // Ensure that we didn't pull in the wrong type from a cache loader + // (e.g. FileCacheLoader) that can only return String + if (buddyFqnTransformer != null && buddyFqnTransformer.isDeadBackupRoot(fqn)) + { + childrenNames = buddyFqnTransformer.getDeadBackupRootChildren(childrenNames); + } + for (Object child : childrenNames) { recursiveMove(Fqn.fromRelativeElements(fqn, child), Fqn.fromRelativeElements(newFqn, child)); Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/LegacyCacheLoaderInterceptor.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/interceptors/LegacyCacheLoaderInterceptor.java 2010-05-05 09:01:58 UTC (rev 8399) +++ core/trunk/src/main/java/org/jboss/cache/interceptors/LegacyCacheLoaderInterceptor.java 2010-05-08 20:30:47 UTC (rev 8400) @@ -26,6 +26,7 @@ import org.jboss.cache.Fqn; import org.jboss.cache.InvocationContext; import org.jboss.cache.NodeSPI; +import org.jboss.cache.buddyreplication.BuddyFqnTransformer; import org.jboss.cache.commands.WriteCommand; import org.jboss.cache.commands.read.GetChildrenNamesCommand; import org.jboss.cache.commands.read.GetDataMapCommand; @@ -86,6 +87,7 @@ protected boolean isActivation = false; protected boolean usingVersionedInvalidation = false; + protected BuddyFqnTransformer buddyFqnTransformer; /** @@ -97,7 +99,8 @@ @Inject protected void injectDependencies(TransactionTable txTable, CacheLoaderManager clm, Configuration configuration, - DataContainer dataContainer, LockManager lockManager, Notifier notifier) + DataContainer dataContainer, LockManager lockManager, Notifier notifier, + BuddyFqnTransformer buddyFqnTransformer) { this.txTable = txTable; this.clm = clm; @@ -106,6 +109,7 @@ this.dataContainer = dataContainer; this.lockManager = lockManager; this.notifier = notifier; + this.buddyFqnTransformer = buddyFqnTransformer; } @Start @@ -383,6 +387,14 @@ } return; } + + // The children of a dead buddy backup root must be Integer. + // Ensure that we didn't pull in the wrong type from a cache loader + // (e.g. FileCacheLoader) that can only return String + if (buddyFqnTransformer != null && buddyFqnTransformer.isDeadBackupRoot(fqn)) + { + childrenNames = buddyFqnTransformer.getDeadBackupRootChildren(childrenNames); + } // Create if node had not been created already if (node == null)

13 years, 11 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbosscache-commits May 2010