You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by ri...@apache.org on 2010/04/01 15:18:00 UTC
svn commit: r929959 -
/felix/branches/org.apache.felix.framework-2.0.5-RC/src/main/java/org/apache/felix/framework/Felix.java
Author: rickhall
Date: Thu Apr 1 13:18:00 2010
New Revision: 929959
URL: http://svn.apache.org/viewvc?rev=929959&view=rev
Log:
Backport FELIX-1753 to framework 2.0.5.
Modified:
felix/branches/org.apache.felix.framework-2.0.5-RC/src/main/java/org/apache/felix/framework/Felix.java
Modified: felix/branches/org.apache.felix.framework-2.0.5-RC/src/main/java/org/apache/felix/framework/Felix.java
URL: http://svn.apache.org/viewvc/felix/branches/org.apache.felix.framework-2.0.5-RC/src/main/java/org/apache/felix/framework/Felix.java?rev=929959&r1=929958&r2=929959&view=diff
==============================================================================
--- felix/branches/org.apache.felix.framework-2.0.5-RC/src/main/java/org/apache/felix/framework/Felix.java (original)
+++ felix/branches/org.apache.felix.framework-2.0.5-RC/src/main/java/org/apache/felix/framework/Felix.java Thu Apr 1 13:18:00 2010
@@ -1093,10 +1093,14 @@ ex.printStackTrace();
}
catch (IllegalStateException ex)
{
- fireFrameworkEvent(FrameworkEvent.ERROR, impl, ex);
- m_logger.log(
- Logger.LOG_ERROR,
- "Error locking " + impl._getLocation(), ex);
+ // Ignore if the bundle has been uninstalled.
+ if (impl.getState() != Bundle.UNINSTALLED)
+ {
+ fireFrameworkEvent(FrameworkEvent.ERROR, impl, ex);
+ m_logger.log(
+ Logger.LOG_ERROR,
+ "Error locking " + impl._getLocation(), ex);
+ }
continue;
}