From 92843349de28227a3418a16895fdb242a2ddd371 Mon Sep 17 00:00:00 2001
From: Brian Stansberry <brian.stansberry@jboss.com>
Date: Tue, 6 Oct 2009 20:42:51 +0000
Subject: [PATCH] [HHH-3849] Disable lock striping in JBoss Cache configs

git-svn-id: https://svn.jboss.org/repos/hibernate/core/trunk@17637 1b8cb986-b30d-0410-93ca-fae66ebed9b2
---
 .../cache/jbc/builder/jbc-configs.xml         | 39 +++++++++++++++++++
 .../src/test/resources/treecache.xml          |  3 ++
 2 files changed, 42 insertions(+)

diff --git a/cache-jbosscache/src/main/resources/org/hibernate/cache/jbc/builder/jbc-configs.xml b/cache-jbosscache/src/main/resources/org/hibernate/cache/jbc/builder/jbc-configs.xml
index a54d1fe8f6..baad4f9ec7 100644
--- a/cache-jbosscache/src/main/resources/org/hibernate/cache/jbc/builder/jbc-configs.xml
+++ b/cache-jbosscache/src/main/resources/org/hibernate/cache/jbc/builder/jbc-configs.xml
@@ -75,6 +75,9 @@
 
         <!-- Max number of milliseconds to wait for a lock acquisition -->
         <attribute name="LockAcquisitionTimeout">15000</attribute>
+        
+        <!--  Lock Striping can lead to deadlocks -->
+        <attribute name="UseLockStriping">false</attribute>
 
         <!--
            Indicate whether to use marshalling or not. Set this to true if you 
@@ -160,6 +163,9 @@
 
         <!-- Max number of milliseconds to wait for a lock acquisition -->
         <attribute name="LockAcquisitionTimeout">15000</attribute>
+        
+        <!--  Lock Striping can lead to deadlocks -->
+        <attribute name="UseLockStriping">false</attribute>
 
        <!--
           Indicate whether to use marshalling or not. Set this to true if you 
@@ -244,6 +250,9 @@
 
         <!-- Max number of milliseconds to wait for a lock acquisition -->
         <attribute name="LockAcquisitionTimeout">15000</attribute>
+        
+        <!--  Lock Striping can lead to deadlocks -->
+        <attribute name="UseLockStriping">false</attribute>
 
        <!--
           Indicate whether to use marshalling or not. Set this to true if you 
@@ -333,6 +342,9 @@
 
         <!-- Max number of milliseconds to wait for a lock acquisition -->
         <attribute name="LockAcquisitionTimeout">15000</attribute>
+        
+        <!--  Lock Striping can lead to deadlocks -->
+        <attribute name="UseLockStriping">false</attribute>
 
         <!--
            Indicate whether to use marshalling or not. Set this to true if you 
@@ -421,6 +433,9 @@
 
         <!-- Max number of milliseconds to wait for a lock acquisition -->
         <attribute name="LockAcquisitionTimeout">15000</attribute>
+        
+        <!--  Lock Striping can lead to deadlocks -->
+        <attribute name="UseLockStriping">false</attribute>
 
         <!--
            Indicate whether to use marshalling or not. Set this to true if you 
@@ -473,6 +488,9 @@
 
         <!-- Max number of milliseconds to wait for a lock acquisition -->
         <attribute name="LockAcquisitionTimeout">15000</attribute>
+        
+        <!--  Lock Striping can lead to deadlocks -->
+        <attribute name="UseLockStriping">false</attribute>
 
         <!--  Eviction policy configurations. -->
         <attribute name="EvictionPolicyConfig">
@@ -542,6 +560,9 @@
 
         <!-- Max number of milliseconds to wait for a lock acquisition -->
         <attribute name="LockAcquisitionTimeout">15000</attribute>
+        
+        <!--  Lock Striping can lead to deadlocks -->
+        <attribute name="UseLockStriping">false</attribute>
 
         <!--
            Indicate whether to use marshalling or not. Set this to true if you 
@@ -622,6 +643,9 @@
 
         <!-- Max number of milliseconds to wait for a lock acquisition -->
         <attribute name="LockAcquisitionTimeout">15000</attribute>
+        
+        <!--  Lock Striping can lead to deadlocks -->
+        <attribute name="UseLockStriping">false</attribute>
 
         <!--
            Indicate whether to use marshalling or not. Set this to true if you 
@@ -709,6 +733,9 @@
 
         <!-- Max number of milliseconds to wait for a lock acquisition -->
         <attribute name="LockAcquisitionTimeout">15000</attribute>
+        
+        <!--  Lock Striping can lead to deadlocks -->
+        <attribute name="UseLockStriping">false</attribute>
 
         <!--
           Indicate whether to use marshalling or not. Set this to true if you are running under a scoped
@@ -799,6 +826,9 @@
 
         <!-- Max number of milliseconds to wait for a lock acquisition -->
         <attribute name="LockAcquisitionTimeout">15000</attribute>
+        
+        <!--  Lock Striping can lead to deadlocks -->
+        <attribute name="UseLockStriping">false</attribute>
 
         <!--
            Indicate whether to use marshalling or not. Set this to true if you 
@@ -889,6 +919,9 @@
 
         <!-- Max number of milliseconds to wait for a lock acquisition -->
         <attribute name="LockAcquisitionTimeout">15000</attribute>
+        
+        <!--  Lock Striping can lead to deadlocks -->
+        <attribute name="UseLockStriping">false</attribute>
 
         <!--
            Indicate whether to use marshalling or not. Set this to true if you 
@@ -977,6 +1010,9 @@
 
         <!-- Max number of milliseconds to wait for a lock acquisition -->
         <attribute name="LockAcquisitionTimeout">15000</attribute>
+        
+        <!--  Lock Striping can lead to deadlocks -->
+        <attribute name="UseLockStriping">false</attribute>
 
         <!--
           Indicate whether to use marshalling or not. Set this to true if you 
@@ -1066,6 +1102,9 @@
 
         <!-- Max number of milliseconds to wait for a lock acquisition -->
         <attribute name="LockAcquisitionTimeout">15000</attribute>
+        
+        <!--  Lock Striping can lead to deadlocks -->
+        <attribute name="UseLockStriping">false</attribute>
 
         <!--
           Indicate whether to use marshalling or not. Set this to true if you 
diff --git a/cache-jbosscache/src/test/resources/treecache.xml b/cache-jbosscache/src/test/resources/treecache.xml
index 291f842255..a4e80956f1 100755
--- a/cache-jbosscache/src/test/resources/treecache.xml
+++ b/cache-jbosscache/src/test/resources/treecache.xml
@@ -98,6 +98,9 @@
 
         <!-- Max number of milliseconds to wait for a lock acquisition -->
         <attribute name="LockAcquisitionTimeout">15000</attribute>
+        
+        <!--  Lock Striping can lead to deadlocks -->
+        <attribute name="UseLockStriping">false</attribute>
 
        <!--
           Indicate whether to use marshalling or not. Set this to true if you