FELIX-3680 Intermediate commit which disables read lock, synchronizes service registration, moves service listener deregistration to deactivate thread (controlled by flag)
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1402238 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/scr/pom.xml b/scr/pom.xml
index 2031064..499cf3c 100644
--- a/scr/pom.xml
+++ b/scr/pom.xml
@@ -307,8 +307,8 @@
kxml2;inline=org/kxml2/io/KXmlParser.class|org/xmlpull/v1/XmlPull**,
backport-util-concurrent;inline=edu/emory/mathcs/backport/java/util/concurrent/TimeUnit.class
|edu/emory/mathcs/backport/java/util/concurrent/TimeUnit*.class
- |edu/emory/mathcs/backport/java/util/concurrent/locks/ReentrantReadWriteLock.class
- |edu/emory/mathcs/backport/java/util/concurrent/locks/ReentrantReadWriteLock*.class
+ |edu/emory/mathcs/backport/java/util/concurrent/locks/ReentrantLock.class
+ |edu/emory/mathcs/backport/java/util/concurrent/locks/ReentrantLock*.class
|edu/emory/mathcs/backport/java/util/concurrent/locks/ReadWriteLock.class
|edu/emory/mathcs/backport/java/util/concurrent/locks/Lock.class
|edu/emory/mathcs/backport/java/util/concurrent/locks/Condition.class
@@ -343,9 +343,7 @@
</signature>
<ignores>
<ignore>java.util.concurrent.atomic.AtomicReference</ignore>
- <ignore>java.util.concurrent.locks.ReentrantReadWriteLock</ignore>
- <ignore>java.util.concurrent.locks.ReentrantReadWriteLock$ReadLock</ignore>
- <ignore>java.util.concurrent.locks.ReentrantReadWriteLock$WriteLock</ignore>
+ <ignore>java.util.concurrent.locks.ReentrantLock</ignore>
<ignore>java.util.concurrent.TimeUnit</ignore>
<ignore>java.lang.management.ManagementFactory</ignore>
<ignore>java.lang.management.ThreadInfo</ignore>