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 10:43:30 UTC
svn commit: r1548470 - in
/felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal:
DirectoryWatcher.java FileInstall.java
Author: gnodet
Date: Fri Dec 6 09:43:30 2013
New Revision: 1548470
URL: http://svn.apache.org/r1548470
Log:
[FELIX-3712] Avoid displaying an InterruptedException if the file install bundle end up refreshing itself
Modified:
felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/DirectoryWatcher.java
felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/FileInstall.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=1548470&r1=1548469&r2=1548470&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 09:43:30 2013
@@ -231,7 +231,14 @@ public class DirectoryWatcher extends Th
Set/*<File>*/ files = scanner.scan(true);
if (files != null)
{
- process(files);
+ try
+ {
+ process(files);
+ }
+ catch (InterruptedException e)
+ {
+ throw new RuntimeException(e);
+ }
}
}
super.start();
@@ -345,7 +352,7 @@ public class DirectoryWatcher extends Th
}
}
- private void process(Set files)
+ private void process(Set files) throws InterruptedException
{
List/*<ArtifactListener>*/ listeners = FileInstall.getListeners();
List/*<Artifact>*/ deleted = new ArrayList/*<Artifact>*/();
@@ -685,7 +692,7 @@ public class DirectoryWatcher extends Th
/**
* Convenience to refresh the packages
*/
- void refresh(Bundle[] bundles)
+ void refresh(Bundle[] bundles) throws InterruptedException
{
FileInstall.refresh(bundles);
}
Modified: felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/FileInstall.java
URL: http://svn.apache.org/viewvc/felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/FileInstall.java?rev=1548470&r1=1548469&r2=1548470&view=diff
==============================================================================
--- felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/FileInstall.java (original)
+++ felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/FileInstall.java Fri Dec 6 09:43:30 2013
@@ -306,18 +306,14 @@ public class FileInstall implements Bund
/**
* Convenience to refresh the packages
*/
- static void refresh(Bundle[] bundles)
+ static void refresh(Bundle[] bundles) throws InterruptedException
{
PackageAdmin padmin = getPackageAdmin();
if (padmin != null)
{
synchronized (refreshLock) {
padmin.refreshPackages(bundles);
- try {
- refreshLock.wait(30000);
- } catch (InterruptedException e) {
- throw new RuntimeException(e);
- }
+ refreshLock.wait(30000);
}
}
}