commit d152d00ad4f559e8afa98a757cb4d76fc915e947
author Felix Meschberger <fmeschbe@apache.org> Mon May 19 07:32:01 2008 +0000
committer Felix Meschberger <fmeschbe@apache.org> Mon May 19 07:32:01 2008 +0000
tree b28a994cc1b6c64a55c5a7926e07c14cb5eb72ae
parent dc7709a0d7e85daf32628e6060afd5f4175256b9

FELIX-570 ignore IllegalStateException when trying to refresh after update

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@657741 13f79535-47bb-0310-9956-ffa450edef68

webconsole/src/main/java/org/apache/felix/webconsole/internal/core/InstallAction.java

diff --git a/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/InstallAction.java b/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/InstallAction.java
index bd8222f..1502773 100644
--- a/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/InstallAction.java
+++ b/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/InstallAction.java
@@ -284,9 +284,15 @@
                 doRun(bundleStream);
 
                 if (refreshPackages) {
-                    PackageAdmin pa = installAction.getPackageAdmin();
-                    if (pa != null) {
-                        pa.refreshPackages(null);
+                    try {
+                        PackageAdmin pa = installAction.getPackageAdmin();
+                        if (pa != null) {
+                            pa.refreshPackages(null);
+                        }
+                    } catch (IllegalStateException ise) {
+                        // This exception is expected if the webconsole bundle
+                        // itself has just been updated. For now, we just
+                        // ignore this exception
                     }
                 }
             } catch (IOException ioe) {