Author: cziegeler
Date: Tue Apr 28 12:31:25 2009
New Revision: 769372

URL: http://svn.apache.org/viewvc?rev=769372&view=rev
Log:
FELIX-1061: Apply patch: webconsole silently ignores bundles which have no 
Bundle-SymbolicName header

Modified:
    
felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/InstallAction.java
    
felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/OsgiManager.java

Modified: 
felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/InstallAction.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/InstallAction.java?rev=769372&r1=769371&r2=769372&view=diff
==============================================================================
--- 
felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/InstallAction.java
 (original)
+++ 
felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/InstallAction.java
 Tue Apr 28 12:31:25 2009
@@ -68,6 +68,7 @@
 
 
     public boolean performAction( HttpServletRequest request, 
HttpServletResponse response )
+    throws IOException
     {
 
         // get the uploaded data
@@ -162,6 +163,7 @@
 
 
     private void installBundle( String location, File bundleFile, int 
startLevel, boolean start, boolean refreshPackages )
+    throws IOException
     {
         if ( bundleFile != null )
         {
@@ -171,7 +173,7 @@
             if ( symbolicName == null )
             {
                 bundleFile.delete();
-                return;
+                throw new IOException(Constants.BUNDLE_SYMBOLICNAME + " header 
missing, cannot install bundle");
             }
 
             // check for existing bundle first

Modified: 
felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/OsgiManager.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/OsgiManager.java?rev=769372&r1=769371&r2=769372&view=diff
==============================================================================
--- 
felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/OsgiManager.java
 (original)
+++ 
felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/OsgiManager.java
 Tue Apr 28 12:31:25 2009
@@ -359,7 +359,7 @@
 
     //---------- internal
 
-    protected boolean handleAction( HttpServletRequest req, 
HttpServletResponse resp ) throws IOException
+    protected boolean handleAction( HttpServletRequest req, 
HttpServletResponse resp ) throws IOException, ServletException
     {
         // check action
         String actionName = AbstractWebConsolePlugin.getParameter( req, 
Util.PARAM_ACTION );
@@ -376,10 +376,12 @@
                 catch ( IOException ioe )
                 {
                     log.log( LogService.LOG_WARNING, ioe.getMessage(), ioe );
+                    throw ioe;
                 }
                 catch ( ServletException se )
                 {
                     log.log( LogService.LOG_WARNING, se.getMessage(), 
se.getRootCause() );
+                    throw se;
                 }
 
                 // maybe overwrite redirect


Reply via email to