August 2012 - jbosscache-commits - Jboss List Archives

JBoss Cache SVN: r8548 - core/support-branches/3.2.8.GA_JBCACHE-1620/src/main/java/org/jboss/cache/lock.

by jbosscache-commits＠lists.jboss.org

Author: dereed Date: 2012-08-02 17:22:33 -0400 (Thu, 02 Aug 2012) New Revision: 8548 Modified: core/support-branches/3.2.8.GA_JBCACHE-1620/src/main/java/org/jboss/cache/lock/PessimisticNodeBasedLockManager.java Log: [JBPAPP-9626] Backport JBCACHE-1620 Modified: core/support-branches/3.2.8.GA_JBCACHE-1620/src/main/java/org/jboss/cache/lock/PessimisticNodeBasedLockManager.java =================================================================== --- core/support-branches/3.2.8.GA_JBCACHE-1620/src/main/java/org/jboss/cache/lock/PessimisticNodeBasedLockManager.java 2012-08-02 21:20:23 UTC (rev 8547) +++ core/support-branches/3.2.8.GA_JBCACHE-1620/src/main/java/org/jboss/cache/lock/PessimisticNodeBasedLockManager.java 2012-08-02 21:22:33 UTC (rev 8548) @@ -146,14 +146,19 @@ // if the new node is to be marked as deleted, do not notify! PessimisticUnversionedNode parentInternalNode = (PessimisticUnversionedNode) parent.getDelegationTarget(); currentNode = parentInternalNode.addChildAndAcquireLock(childName, !skipNotification, new LockAcquirer(ctx, WRITE, timeout, owner)); - skipLockAcquire = true; - if (!created) + + //JBCACHE-1620 make sure we created and locked the node, not a different thread + if ( currentNode.getLock().isOwner(owner) ) { - created = true; - createdLevel = currentIndex; + skipLockAcquire = true; + if (!created) + { + created = true; + createdLevel = currentIndex; + } + if (trace) log.trace("Child node was null, so created child node " + childName); + if (createdNodes != null) createdNodes.add(currentNode); } - if (trace) log.trace("Child node was null, so created child node " + childName); - if (createdNodes != null) createdNodes.add(currentNode); } else {

12 years, 5 months

1
0
0 / 0

JBoss Cache SVN: r8547 - in core/support-branches/3.2.8.GA_JBCACHE-1620: src/main/java/org/jboss/cache and 1 other directory.

by jbosscache-commits＠lists.jboss.org

Author: dereed Date: 2012-08-02 17:20:23 -0400 (Thu, 02 Aug 2012) New Revision: 8547 Modified: core/support-branches/3.2.8.GA_JBCACHE-1620/pom.xml core/support-branches/3.2.8.GA_JBCACHE-1620/src/main/java/org/jboss/cache/Version.java Log: [JBPAPP-9926] Update version for one-off Modified: core/support-branches/3.2.8.GA_JBCACHE-1620/pom.xml =================================================================== --- core/support-branches/3.2.8.GA_JBCACHE-1620/pom.xml 2012-08-02 21:13:14 UTC (rev 8546) +++ core/support-branches/3.2.8.GA_JBCACHE-1620/pom.xml 2012-08-02 21:20:23 UTC (rev 8547) @@ -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.8.GA</jbosscache-core-version> + <jbosscache-core-version>3.2.8.GA_JBCACHE-1620</jbosscache-core-version>  <defaultTestGroup>unit</defaultTestGroup>  Modified: core/support-branches/3.2.8.GA_JBCACHE-1620/src/main/java/org/jboss/cache/Version.java =================================================================== --- core/support-branches/3.2.8.GA_JBCACHE-1620/src/main/java/org/jboss/cache/Version.java 2012-08-02 21:13:14 UTC (rev 8546) +++ core/support-branches/3.2.8.GA_JBCACHE-1620/src/main/java/org/jboss/cache/Version.java 2012-08-02 21:20:23 UTC (rev 8547) @@ -32,10 +32,10 @@ @Immutable public class Version { - public static final String version = "3.2.8.GA"; + public static final String version = "3.2.8.GA_JBCACHE_1620"; public static final String codename = "Malagueta"; //public static final String cvs = "$Id$"; - static final byte[] version_id = {'0','3','2','8','G','A'}; + static final byte[] version_id = {'0','3','2','8','G','A','_','J','B','C','A','C','H','E','-','1','6','2','0'}; private static final int MAJOR_SHIFT = 11; private static final int MINOR_SHIFT = 6;

12 years, 5 months

1
0
0 / 0

JBoss Cache SVN: r8546 - core/support-branches.

by jbosscache-commits＠lists.jboss.org

Author: dereed Date: 2012-08-02 17:13:14 -0400 (Thu, 02 Aug 2012) New Revision: 8546 Added: core/support-branches/3.2.8.GA_JBCACHE-1620/ Log: [JBPAPP-9626] Backport JBCACHE-1620 to 3.2.8

12 years, 5 months

1
0
0 / 0

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

by jbosscache-commits＠lists.jboss.org

Author: dereed Date: 2012-08-02 16:58:35 -0400 (Thu, 02 Aug 2012) New Revision: 8545 Modified: core/tags/3.2.10.GA/pom.xml core/tags/3.2.10.GA/src/main/java/org/jboss/cache/Version.java Log: JBoss Cache Release Script: Updating 3.2.10.GA Modified: core/tags/3.2.10.GA/pom.xml =================================================================== --- core/tags/3.2.10.GA/pom.xml 2012-08-02 20:53:04 UTC (rev 8544) +++ core/tags/3.2.10.GA/pom.xml 2012-08-02 20:58:35 UTC (rev 8545) @@ -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.9-SNAPSHOT</jbosscache-core-version> + <jbosscache-core-version>3.2.10.GA</jbosscache-core-version>  <defaultTestGroup>unit</defaultTestGroup>  @@ -477,7 +477,7 @@ <activeByDefault>false</activeByDefault> </activation> <properties> - <jbosscache-core-version>3.2.1-SNAPSHOT-JBossAS</jbosscache-core-version> + <jbosscache-core-version>3.2.10.GA-JBossAS</jbosscache-core-version> <defaultTestGroup>functional,unit</defaultTestGroup> <protocol.stack>tcp</protocol.stack> </properties> Modified: core/tags/3.2.10.GA/src/main/java/org/jboss/cache/Version.java =================================================================== --- core/tags/3.2.10.GA/src/main/java/org/jboss/cache/Version.java 2012-08-02 20:53:04 UTC (rev 8544) +++ core/tags/3.2.10.GA/src/main/java/org/jboss/cache/Version.java 2012-08-02 20:58:35 UTC (rev 8545) @@ -32,10 +32,10 @@ @Immutable public class Version { - public static final String version = "3.2.1-SNAPSHOT"; + public static final String version = "3.2.10.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','1','0','G','A'}; private static final int MAJOR_SHIFT = 11; private static final int MINOR_SHIFT = 6;

12 years, 5 months

1
0
0 / 0

JBoss Cache SVN: r8544 - core/tags.

by jbosscache-commits＠lists.jboss.org

Author: dereed Date: 2012-08-02 16:53:04 -0400 (Thu, 02 Aug 2012) New Revision: 8544 Added: core/tags/3.2.10.GA/ Log: JBoss Cache Release Script: Tagging 3.2.10.GA

12 years, 5 months

1
0
0 / 0

JBoss Cache SVN: r8543 - core/trunk.

by jbosscache-commits＠lists.jboss.org

Author: dereed Date: 2012-08-02 16:52:34 -0400 (Thu, 02 Aug 2012) New Revision: 8543 Modified: core/trunk/release.sh Log: Update release.sh to accept point release versions > 9 Modified: core/trunk/release.sh =================================================================== --- core/trunk/release.sh 2012-08-02 20:25:22 UTC (rev 8542) +++ core/trunk/release.sh 2012-08-02 20:52:34 UTC (rev 8543) @@ -37,7 +37,7 @@ exit 0 fi - if [[ $ver =~ ^[1-9]\.[0-9]\.[0-9]\.(GA|(ALPHA|BETA|CR|SP)[1-9][0-9]?)$ ]] + if [[ $ver =~ ^[1-9]\.[0-9]\.[1-9]?[0-9]\.(GA|(ALPHA|BETA|CR|SP)[1-9][0-9]?)$ ]] then #matches! echo "Releasing version $ver"

12 years, 5 months

1
0
0 / 0

JBoss Cache SVN: r8542 - core/trunk/src/main/java/org/jboss/cache/lock.

by jbosscache-commits＠lists.jboss.org

Author: dereed Date: 2012-08-02 16:25:22 -0400 (Thu, 02 Aug 2012) New Revision: 8542 Modified: core/trunk/src/main/java/org/jboss/cache/lock/PessimisticNodeBasedLockManager.java Log: [JBCACHE-1620] Fix race condition when two nodes try to create the same child while locking Modified: core/trunk/src/main/java/org/jboss/cache/lock/PessimisticNodeBasedLockManager.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/lock/PessimisticNodeBasedLockManager.java 2012-08-02 01:30:11 UTC (rev 8541) +++ core/trunk/src/main/java/org/jboss/cache/lock/PessimisticNodeBasedLockManager.java 2012-08-02 20:25:22 UTC (rev 8542) @@ -146,14 +146,19 @@ // if the new node is to be marked as deleted, do not notify! PessimisticUnversionedNode parentInternalNode = (PessimisticUnversionedNode) parent.getDelegationTarget(); currentNode = parentInternalNode.addChildAndAcquireLock(childName, !skipNotification, new LockAcquirer(ctx, WRITE, timeout, owner)); - skipLockAcquire = true; - if (!created) + + //JBCACHE-1620 make sure we created and locked the node, not a different thread + if ( currentNode.getLock().isOwner(owner) ) { - created = true; - createdLevel = currentIndex; + skipLockAcquire = true; + if (!created) + { + created = true; + createdLevel = currentIndex; + } + if (trace) log.trace("Child node was null, so created child node " + childName); + if (createdNodes != null) createdNodes.add(currentNode); } - if (trace) log.trace("Child node was null, so created child node " + childName); - if (createdNodes != null) createdNodes.add(currentNode); } else {

12 years, 5 months

1
0
0 / 0

JBoss Cache SVN: r8541 - core/support-branches/3.2.2.GA_JBCACHE-1613_JBCACHE-1617_JBCACHE-1618_JBCACHE-1619/src/main/java/org/jboss/cache/interceptors.

by jbosscache-commits＠lists.jboss.org

Author: dereed Date: 2012-08-01 21:30:11 -0400 (Wed, 01 Aug 2012) New Revision: 8541 Modified: core/support-branches/3.2.2.GA_JBCACHE-1613_JBCACHE-1617_JBCACHE-1618_JBCACHE-1619/src/main/java/org/jboss/cache/interceptors/ReplicationInterceptor.java Log: [JBPAPP-9615] Backport JBCACHE-1619 Modified: core/support-branches/3.2.2.GA_JBCACHE-1613_JBCACHE-1617_JBCACHE-1618_JBCACHE-1619/src/main/java/org/jboss/cache/interceptors/ReplicationInterceptor.java =================================================================== --- core/support-branches/3.2.2.GA_JBCACHE-1613_JBCACHE-1617_JBCACHE-1618_JBCACHE-1619/src/main/java/org/jboss/cache/interceptors/ReplicationInterceptor.java 2012-08-02 01:29:49 UTC (rev 8540) +++ core/support-branches/3.2.2.GA_JBCACHE-1613_JBCACHE-1617_JBCACHE-1618_JBCACHE-1619/src/main/java/org/jboss/cache/interceptors/ReplicationInterceptor.java 2012-08-02 01:30:11 UTC (rev 8541) @@ -78,7 +78,7 @@ { if (!skipReplicationOfTransactionMethod(ctx) && !ctx.isLocalRollbackOnly()) { - replicateCall(ctx, command, configuration.isSyncRollbackPhase(), ctx.getOptionOverrides()); + replicateCall(ctx, command, configuration.isSyncRollbackPhase(), ctx.getOptionOverrides(), true); } return invokeNextInterceptor(ctx, command); }

12 years, 5 months

1
0
0 / 0

JBoss Cache SVN: r8540 - in core/support-branches/3.2.2.GA_JBCACHE-1613_JBCACHE-1617_JBCACHE-1618_JBCACHE-1619: src/main/java/org/jboss/cache and 1 other directory.

by jbosscache-commits＠lists.jboss.org

Author: dereed Date: 2012-08-01 21:29:49 -0400 (Wed, 01 Aug 2012) New Revision: 8540 Modified: core/support-branches/3.2.2.GA_JBCACHE-1613_JBCACHE-1617_JBCACHE-1618_JBCACHE-1619/pom.xml core/support-branches/3.2.2.GA_JBCACHE-1613_JBCACHE-1617_JBCACHE-1618_JBCACHE-1619/src/main/java/org/jboss/cache/Version.java Log: [JBPAPP-9615] Change version for one-off Modified: core/support-branches/3.2.2.GA_JBCACHE-1613_JBCACHE-1617_JBCACHE-1618_JBCACHE-1619/pom.xml =================================================================== --- core/support-branches/3.2.2.GA_JBCACHE-1613_JBCACHE-1617_JBCACHE-1618_JBCACHE-1619/pom.xml 2012-08-02 01:25:38 UTC (rev 8539) +++ core/support-branches/3.2.2.GA_JBCACHE-1613_JBCACHE-1617_JBCACHE-1618_JBCACHE-1619/pom.xml 2012-08-02 01:29:49 UTC (rev 8540) @@ -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.2.GA_JBCACHE-1613_JBCACHE-1617_JBCACHE-1618</jbosscache-core-version> + <jbosscache-core-version>3.2.2.GA_JBCACHE-1613_JBCACHE-1617_JBCACHE-1618_JBCACHE-1619</jbosscache-core-version>  <defaultTestGroup>unit</defaultTestGroup>  Modified: core/support-branches/3.2.2.GA_JBCACHE-1613_JBCACHE-1617_JBCACHE-1618_JBCACHE-1619/src/main/java/org/jboss/cache/Version.java =================================================================== --- core/support-branches/3.2.2.GA_JBCACHE-1613_JBCACHE-1617_JBCACHE-1618_JBCACHE-1619/src/main/java/org/jboss/cache/Version.java 2012-08-02 01:25:38 UTC (rev 8539) +++ core/support-branches/3.2.2.GA_JBCACHE-1613_JBCACHE-1617_JBCACHE-1618_JBCACHE-1619/src/main/java/org/jboss/cache/Version.java 2012-08-02 01:29:49 UTC (rev 8540) @@ -32,10 +32,10 @@ @Immutable public class Version { - public static final String version = "3.2.2.GA_JBCACHE-1613_JBCACHE-1617_JBCACHE-1618"; + public static final String version = "3.2.2.GA_JBCACHE-1613_JBCACHE-1617_JBCACHE-1618_JBCACHE-1619"; public static final String codename = "Malagueta"; //public static final String cvs = "$Id$"; - static final byte[] version_id = {'0','3','2','2','G','A','_','J','B','C','A','C','H','E','-','1','6','1','3','_','J','B','C','A','C','H','E','-','1','6','1','7','_','J','B','C','A','C','H','E','-','1','6','1','8'}; + static final byte[] version_id = {'0','3','2','2','G','A','_','J','B','C','A','C','H','E','-','1','6','1','3','_','J','B','C','A','C','H','E','-','1','6','1','7','_','J','B','C','A','C','H','E','-','1','6','1','8','_','J','B','C','A','C','H','E','-','1','6','1','9'}; private static final int MAJOR_SHIFT = 11; private static final int MINOR_SHIFT = 6;

12 years, 5 months

1
0
0 / 0

JBoss Cache SVN: r8539 - core/support-branches/3.2.8.GA_JBCACHE-1618_JBCACHE-1619/src/main/java/org/jboss/cache/interceptors.

by jbosscache-commits＠lists.jboss.org

Author: dereed Date: 2012-08-01 21:25:38 -0400 (Wed, 01 Aug 2012) New Revision: 8539 Modified: core/support-branches/3.2.8.GA_JBCACHE-1618_JBCACHE-1619/src/main/java/org/jboss/cache/interceptors/ReplicationInterceptor.java Log: [JBPAPP-9614] Backport JBCACHE-1619 Modified: core/support-branches/3.2.8.GA_JBCACHE-1618_JBCACHE-1619/src/main/java/org/jboss/cache/interceptors/ReplicationInterceptor.java =================================================================== --- core/support-branches/3.2.8.GA_JBCACHE-1618_JBCACHE-1619/src/main/java/org/jboss/cache/interceptors/ReplicationInterceptor.java 2012-08-02 01:24:36 UTC (rev 8538) +++ core/support-branches/3.2.8.GA_JBCACHE-1618_JBCACHE-1619/src/main/java/org/jboss/cache/interceptors/ReplicationInterceptor.java 2012-08-02 01:25:38 UTC (rev 8539) @@ -78,7 +78,7 @@ { if (!skipReplicationOfTransactionMethod(ctx) && !ctx.isLocalRollbackOnly()) { - replicateCall(ctx, command, configuration.isSyncRollbackPhase(), ctx.getOptionOverrides()); + replicateCall(ctx, command, configuration.isSyncRollbackPhase(), ctx.getOptionOverrides(), true); } return invokeNextInterceptor(ctx, command); }

12 years, 5 months

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbosscache-commits August 2012