svn commit: r727824 - /felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java

[ri...@apache.org]

Author: rickhall
Date: Thu Dec 18 13:02:07 2008
New Revision: 727824

URL: http://svn.apache.org/viewvc?rev=727824&view=rev
Log:
Properly dispose of the module if it is determined that its native library
entries do not exist; if they do not exist an exception is thrown which
was previously just leaving the invalid module in the module factory.
(FELIX-835)

Modified:
    felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java

Modified: felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java
URL: http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java?rev=727824&r1=727823&r2=727824&view=diff
==============================================================================
--- felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java (original)
+++ felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java Thu Dec 18 13:02:07 2008
@@ -3505,6 +3505,9 @@
                     // The content loader was opened when trying to find the libraries,
                     // so make sure to close it since it will be deleted.
                     contentLoader.close();
+                    // Remove the module we created, since it is not valid and
+                    // has not yet been added to the bundle to be removed later.
+                    m_factory.removeModule(module);
                     throw new BundleException("Native library does not exist: " + entryName);
                 }
             }