You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by gn...@apache.org on 2013/12/06 11:13:58 UTC

svn commit: r1548482 - /felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/DirectoryWatcher.java

Author: gnodet
Date: Fri Dec  6 10:13:57 2013
New Revision: 1548482

URL: http://svn.apache.org/r1548482
Log:
[FELIX-3714] Error when when fragment bundle is updated

Modified:
    felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/DirectoryWatcher.java

Modified: felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/DirectoryWatcher.java
URL: http://svn.apache.org/viewvc/felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/DirectoryWatcher.java?rev=1548482&r1=1548481&r2=1548482&view=diff
==============================================================================
--- felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/DirectoryWatcher.java (original)
+++ felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/DirectoryWatcher.java Fri Dec  6 10:13:57 2013
@@ -1311,7 +1311,8 @@ public class DirectoryWatcher extends Th
                         Clause path = clauses[0];
                         for (Iterator it = bundles.iterator(); it.hasNext();) {
                             Bundle hostBundle = (Bundle) it.next();
-                            if (hostBundle.getSymbolicName().equals(path.getName())) {
+                            if (hostBundle.getSymbolicName() != null &&
+                                    hostBundle.getSymbolicName().equals(path.getName())) {
                                 String ver = path.getAttribute(Constants.BUNDLE_VERSION_ATTRIBUTE);
                                 if (ver != null) {
                                     VersionRange v = VersionRange.parseVersionRange(ver);