Author: djencks
Date: Mon Sep 10 06:23:20 2012
New Revision: 1382649
URL: http://svn.apache.org/viewvc?rev=1382649&view=rev
Log:
FELIX-3456 correct which EDU classes we are pulling in, and log info for EDU
lock's IllegalStateException
Modified:
felix/trunk/scr/pom.xml
felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/AbstractComponentManager.java
Modified: felix/trunk/scr/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/scr/pom.xml?rev=1382649&r1=1382648&r2=1382649&view=diff
==============================================================================
--- felix/trunk/scr/pom.xml (original)
+++ felix/trunk/scr/pom.xml Mon Sep 10 06:23:20 2012
@@ -305,7 +305,7 @@
</DynamicImport-Package>
<Embed-Dependency>
kxml2;inline=org/kxml2/io/KXmlParser.class|org/xmlpull/v1/XmlPull**,
-
concurrent;inline=EDU/oswego/cs/dl/util/concurrent/ReentrantLock.class|EDU/oswego/cs/dl/util/concurrent/Sync.class
+
concurrent;inline=EDU/oswego/cs/dl/util/concurrent/ReentrantWriterPreferenceReadWriteLock.class|EDU/oswego/cs/dl/util/concurrent/WriterPreferenceReadWriteLock*|EDU/oswego/cs/dl/util/concurrent/ReadWriteLock.class|EDU/oswego/cs/dl/util/concurrent/SynchronizedRef.class|EDU/oswego/cs/dl/util/concurrent/SynchronizedVariable.class|EDU/oswego/cs/dl/util/concurrent/Sync.class|EDU/oswego/cs/dl/util/concurrent/Executor.class
</Embed-Dependency>
</instructions>
</configuration>
Modified:
felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/AbstractComponentManager.java
URL:
http://svn.apache.org/viewvc/felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/AbstractComponentManager.java?rev=1382649&r1=1382648&r2=1382649&view=diff
==============================================================================
---
felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/AbstractComponentManager.java
(original)
+++
felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/AbstractComponentManager.java
Mon Sep 10 06:23:20 2012
@@ -219,17 +219,27 @@ public abstract class AbstractComponentM
}
catch ( IllegalMonitorStateException e )
{
- StringBuffer b = new StringBuffer( "Locking activity before
IllegalMonitorStateException: \n" );
- for (Iterator i = lockingActivity.iterator(); i.hasNext();)
- {
- b.append( " " ).append( i.next() ).append( "\n" );
- }
- log( LogService.LOG_ERROR, b.toString(), null );
- dumpThreads();
+ logLockingInfo();
+ throw e;
+ }
+ catch ( IllegalStateException e ) //for EDU lock
+ {
+ logLockingInfo();
throw e;
}
}
+ private void logLockingInfo()
+ {
+ StringBuffer b = new StringBuffer( "Locking activity before
IllegalMonitorStateException: \n" );
+ for (Iterator i = lockingActivity.iterator(); i.hasNext();)
+ {
+ b.append( " " ).append( i.next() ).append( "\n" );
+ }
+ log( LogService.LOG_ERROR, b.toString(), null );
+ dumpThreads();
+ }
+
final void obtainWriteLock( String source )
{
if ( isLogEnabled( LogService.LOG_DEBUG ) )
