You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gn...@apache.org on 2015/07/09 10:26:52 UTC

[1/2] karaf git commit: [KARAF-3842] Avoid possible leaks with servlet events

Repository: karaf
Updated Branches:
  refs/heads/master 98b83da57 -> ea9e4c8cc


[KARAF-3842] Avoid possible leaks with servlet events

Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/16dcd1eb
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/16dcd1eb
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/16dcd1eb

Branch: refs/heads/master
Commit: 16dcd1ebebcb4c14289ec7ef49fbcd8006176bb0
Parents: 98b83da
Author: Guillaume Nodet <gn...@apache.org>
Authored: Thu Jul 9 09:48:02 2015 +0200
Committer: Guillaume Nodet <gn...@apache.org>
Committed: Thu Jul 9 09:48:02 2015 +0200

----------------------------------------------------------------------
 .../http/core/internal/ServletEventHandler.java | 19 ++++++--
 .../http/core/internal/osgi/Activator.java      | 23 ++++++++-
 .../web/internal/WebContainerServiceImpl.java   | 15 +++++-
 .../karaf/web/internal/osgi/Activator.java      | 14 +++++-
 .../webconsole/http/ServletEventHandler.java    | 50 ++++++++++++++++++--
 .../OSGI-INF/blueprint/webconsole-http.xml      |  5 +-
 6 files changed, 113 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/16dcd1eb/http/src/main/java/org/apache/karaf/http/core/internal/ServletEventHandler.java
----------------------------------------------------------------------
diff --git a/http/src/main/java/org/apache/karaf/http/core/internal/ServletEventHandler.java b/http/src/main/java/org/apache/karaf/http/core/internal/ServletEventHandler.java
index 2733175..3f794b6 100644
--- a/http/src/main/java/org/apache/karaf/http/core/internal/ServletEventHandler.java
+++ b/http/src/main/java/org/apache/karaf/http/core/internal/ServletEventHandler.java
@@ -16,26 +16,39 @@
  */
 package org.apache.karaf.http.core.internal;
 
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.Map;
 
 import org.ops4j.pax.web.service.spi.ServletEvent;
 import org.ops4j.pax.web.service.spi.ServletListener;
+import org.osgi.framework.Bundle;
 
 public class ServletEventHandler implements ServletListener {
 
 	Map<String, ServletEvent> servletEvents =  new HashMap<String, ServletEvent>();
 	
-	public void servletEvent(ServletEvent event) {
+	public synchronized void servletEvent(ServletEvent event) {
 		servletEvents.put(event.getServletName(), event);
 	}
 
 	/**
 	 * @return the servletEvents
 	 */
-	public Collection<ServletEvent> getServletEvents() {
-		return servletEvents.values();
+	public synchronized Collection<ServletEvent> getServletEvents() {
+		return new ArrayList<>(servletEvents.values());
+	}
+
+	public synchronized void removeEventsForBundle(Bundle bundle) {
+		Iterator<Map.Entry<String,ServletEvent>> iterator = servletEvents.entrySet().iterator();
+		while (iterator.hasNext()) {
+			Map.Entry<String,ServletEvent> entry = iterator.next();
+			if (entry.getValue().getBundle() == bundle) {
+				iterator.remove();
+			}
+		}
 	}
 
 }

http://git-wip-us.apache.org/repos/asf/karaf/blob/16dcd1eb/http/src/main/java/org/apache/karaf/http/core/internal/osgi/Activator.java
----------------------------------------------------------------------
diff --git a/http/src/main/java/org/apache/karaf/http/core/internal/osgi/Activator.java b/http/src/main/java/org/apache/karaf/http/core/internal/osgi/Activator.java
index 2e6291c..5365a9a 100644
--- a/http/src/main/java/org/apache/karaf/http/core/internal/osgi/Activator.java
+++ b/http/src/main/java/org/apache/karaf/http/core/internal/osgi/Activator.java
@@ -24,20 +24,41 @@ import org.apache.karaf.util.tracker.BaseActivator;
 import org.apache.karaf.util.tracker.annotation.ProvideService;
 import org.apache.karaf.util.tracker.annotation.Services;
 import org.ops4j.pax.web.service.spi.ServletListener;
+import org.osgi.framework.BundleEvent;
+import org.osgi.framework.BundleListener;
 
 @Services(provides = @ProvideService(ServletService.class))
 public class Activator extends BaseActivator {
 
+    private BundleListener listener;
+
     @Override
     protected void doStart() throws Exception {
-        ServletEventHandler servletEventHandler = new ServletEventHandler();
+        final ServletEventHandler servletEventHandler = new ServletEventHandler();
         register(ServletListener.class, servletEventHandler);
 
         ServletServiceImpl servletService = new ServletServiceImpl(servletEventHandler);
         register(ServletService.class, servletService);
 
+        listener = new BundleListener() {
+            @Override
+            public void bundleChanged(BundleEvent event) {
+                if (event.getType() == BundleEvent.UNINSTALLED
+                        || event.getType() == BundleEvent.UNRESOLVED
+                        || event.getType() == BundleEvent.STOPPED) {
+                    servletEventHandler.removeEventsForBundle(event.getBundle());
+                }
+            }
+        };
+        bundleContext.addBundleListener(listener);
+
         HttpMBeanImpl httpMBean = new HttpMBeanImpl(servletService);
         registerMBean(httpMBean, "type=http");
     }
 
+    @Override
+    protected void doStop() {
+        bundleContext.removeBundleListener(listener);
+        super.doStop();
+    }
 }

http://git-wip-us.apache.org/repos/asf/karaf/blob/16dcd1eb/web/src/main/java/org/apache/karaf/web/internal/WebContainerServiceImpl.java
----------------------------------------------------------------------
diff --git a/web/src/main/java/org/apache/karaf/web/internal/WebContainerServiceImpl.java b/web/src/main/java/org/apache/karaf/web/internal/WebContainerServiceImpl.java
index d2c8bd5..bab1bdd 100644
--- a/web/src/main/java/org/apache/karaf/web/internal/WebContainerServiceImpl.java
+++ b/web/src/main/java/org/apache/karaf/web/internal/WebContainerServiceImpl.java
@@ -22,6 +22,8 @@ import org.ops4j.pax.web.service.spi.WarManager;
 import org.ops4j.pax.web.service.spi.WebEvent;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
+import org.osgi.framework.BundleEvent;
+import org.osgi.framework.BundleListener;
 import org.osgi.framework.Constants;
 import org.osgi.framework.startlevel.BundleStartLevel;
 import org.slf4j.Logger;
@@ -34,7 +36,7 @@ import java.util.Map;
 /**
  * Implementation of the WebContainer service.
  */
-public class WebContainerServiceImpl implements WebContainerService {
+public class WebContainerServiceImpl implements WebContainerService, BundleListener {
     
     private BundleContext bundleContext;
     private WebEventHandler webEventHandler;
@@ -53,7 +55,16 @@ public class WebContainerServiceImpl implements WebContainerService {
     public void setWarManager(WarManager warManager) {
         this.warManager = warManager;
     }
-    
+
+    @Override
+    public void bundleChanged(BundleEvent bundleEvent) {
+        if (bundleEvent.getType() == BundleEvent.UNINSTALLED
+                || bundleEvent.getType() == BundleEvent.UNRESOLVED
+                || bundleEvent.getType() == BundleEvent.STOPPED) {
+            webEventHandler.getBundleEvents().remove(bundleEvent.getBundle().getBundleId());
+        }
+    }
+
     public List<WebBundle> list() throws Exception {
         Bundle[] bundles = bundleContext.getBundles();
         Map<Long, WebEvent> bundleEvents = webEventHandler.getBundleEvents();

http://git-wip-us.apache.org/repos/asf/karaf/blob/16dcd1eb/web/src/main/java/org/apache/karaf/web/internal/osgi/Activator.java
----------------------------------------------------------------------
diff --git a/web/src/main/java/org/apache/karaf/web/internal/osgi/Activator.java b/web/src/main/java/org/apache/karaf/web/internal/osgi/Activator.java
index 266ab25..db1ee64 100644
--- a/web/src/main/java/org/apache/karaf/web/internal/osgi/Activator.java
+++ b/web/src/main/java/org/apache/karaf/web/internal/osgi/Activator.java
@@ -33,6 +33,8 @@ import org.ops4j.pax.web.service.spi.WebListener;
 )
 public class Activator extends BaseActivator {
 
+    private WebContainerServiceImpl webContainerService;
+
     @Override
     protected void doStart() throws Exception {
         WarManager warManager = getTrackedService(WarManager.class);
@@ -43,7 +45,8 @@ public class Activator extends BaseActivator {
         WebEventHandler webEventHandler = new WebEventHandler();
         register(WebListener.class, webEventHandler);
 
-        WebContainerServiceImpl webContainerService = new WebContainerServiceImpl();
+        webContainerService = new WebContainerServiceImpl();
+        bundleContext.addBundleListener(webContainerService);
         webContainerService.setBundleContext(bundleContext);
         webContainerService.setWarManager(warManager);
         webContainerService.setWebEventHandler(webEventHandler);
@@ -54,4 +57,13 @@ public class Activator extends BaseActivator {
         registerMBean(webMBean, "type=web");
     }
 
+    @Override
+    protected void doStop() {
+        if (webContainerService != null) {
+            bundleContext.removeBundleListener(webContainerService);
+            webContainerService = null;
+        }
+        super.doStop();
+    }
+
 }

http://git-wip-us.apache.org/repos/asf/karaf/blob/16dcd1eb/webconsole/http/src/main/java/org/apache/karaf/webconsole/http/ServletEventHandler.java
----------------------------------------------------------------------
diff --git a/webconsole/http/src/main/java/org/apache/karaf/webconsole/http/ServletEventHandler.java b/webconsole/http/src/main/java/org/apache/karaf/webconsole/http/ServletEventHandler.java
index a4b92bb..6d7b6b3 100644
--- a/webconsole/http/src/main/java/org/apache/karaf/webconsole/http/ServletEventHandler.java
+++ b/webconsole/http/src/main/java/org/apache/karaf/webconsole/http/ServletEventHandler.java
@@ -16,24 +16,64 @@
  */
 package org.apache.karaf.webconsole.http;
 
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.Map;
 
 import org.ops4j.pax.web.service.spi.ServletEvent;
 import org.ops4j.pax.web.service.spi.ServletListener;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.BundleEvent;
+import org.osgi.framework.BundleListener;
 
-public class ServletEventHandler implements ServletListener {
+public class ServletEventHandler implements ServletListener, BundleListener {
 
-    Map<String, ServletEvent> servletEvents = new HashMap<String, ServletEvent>();
+    BundleContext bundleContext;
+    Map<String, ServletEvent> servletEvents =  new HashMap<String, ServletEvent>();
+
+    public void setBundleContext(BundleContext bundleContext) {
+        this.bundleContext = bundleContext;
+    }
+
+    public void init() {
+        bundleContext.addBundleListener(this);
+    }
+
+    public void destroy() {
+        bundleContext.removeBundleListener(this);
+    }
 
     @Override
-    public void servletEvent(ServletEvent event) {
+    public void bundleChanged(BundleEvent event) {
+        if (event.getType() == BundleEvent.UNINSTALLED
+                || event.getType() == BundleEvent.UNRESOLVED
+                || event.getType() == BundleEvent.STOPPED) {
+            removeEventsForBundle(event.getBundle());
+        }
+    }
+
+    public synchronized void servletEvent(ServletEvent event) {
         servletEvents.put(event.getServletName(), event);
     }
 
-    public Collection<ServletEvent> getServletEvents() {
-        return servletEvents.values();
+    /**
+     * @return the servletEvents
+     */
+    public synchronized Collection<ServletEvent> getServletEvents() {
+        return new ArrayList<>(servletEvents.values());
+    }
+
+    public synchronized void removeEventsForBundle(Bundle bundle) {
+        Iterator<Map.Entry<String,ServletEvent>> iterator = servletEvents.entrySet().iterator();
+        while (iterator.hasNext()) {
+            Map.Entry<String,ServletEvent> entry = iterator.next();
+            if (entry.getValue().getBundle() == bundle) {
+                iterator.remove();
+            }
+        }
     }
 
 }

http://git-wip-us.apache.org/repos/asf/karaf/blob/16dcd1eb/webconsole/http/src/main/resources/OSGI-INF/blueprint/webconsole-http.xml
----------------------------------------------------------------------
diff --git a/webconsole/http/src/main/resources/OSGI-INF/blueprint/webconsole-http.xml b/webconsole/http/src/main/resources/OSGI-INF/blueprint/webconsole-http.xml
index 93be4c3..2975f28 100644
--- a/webconsole/http/src/main/resources/OSGI-INF/blueprint/webconsole-http.xml
+++ b/webconsole/http/src/main/resources/OSGI-INF/blueprint/webconsole-http.xml
@@ -19,7 +19,10 @@
 -->
 <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0" default-activation="lazy">
 
-	<bean id="eaHandler" class="org.apache.karaf.webconsole.http.ServletEventHandler" />
+	<bean id="eaHandler" class="org.apache.karaf.webconsole.http.ServletEventHandler"
+            init-method="init" destroy-method="destroy">
+        <property name="bundleContext" ref="blueprintBundleContext" />
+    </bean>
     <service id="servletListener"
              interface="org.ops4j.pax.web.service.spi.ServletListener"
              ref="eaHandler" />


[2/2] karaf git commit: Remove spaces around the ‘/’ for bundles when the deployer explains its actions

Posted by gn...@apache.org.
Remove spaces around the ‘/’ for bundles when the deployer explains its actions

Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/ea9e4c8c
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/ea9e4c8c
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/ea9e4c8c

Branch: refs/heads/master
Commit: ea9e4c8cc4ff908f223b979bd143aaef9486bb83
Parents: 16dcd1e
Author: Guillaume Nodet <gn...@apache.org>
Authored: Thu Jul 9 10:19:04 2015 +0200
Committer: Guillaume Nodet <gn...@apache.org>
Committed: Thu Jul 9 10:19:04 2015 +0200

----------------------------------------------------------------------
 .../karaf/features/internal/service/Deployer.java | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/ea9e4c8c/features/core/src/main/java/org/apache/karaf/features/internal/service/Deployer.java
----------------------------------------------------------------------
diff --git a/features/core/src/main/java/org/apache/karaf/features/internal/service/Deployer.java b/features/core/src/main/java/org/apache/karaf/features/internal/service/Deployer.java
index 574bac7..525d354 100644
--- a/features/core/src/main/java/org/apache/karaf/features/internal/service/Deployer.java
+++ b/features/core/src/main/java/org/apache/karaf/features/internal/service/Deployer.java
@@ -496,13 +496,13 @@ public class Deployer {
                 print("  Bundles to refresh:", verbose);
                 for (Map.Entry<Bundle, String> entry : toRefresh.entrySet()) {
                     Bundle bundle = entry.getKey();
-                    print("    " + bundle.getSymbolicName() + " / " + bundle.getVersion() + " (" + entry.getValue() + ")", verbose);
+                    print("    " + bundle.getSymbolicName() + "/" + bundle.getVersion() + " (" + entry.getValue() + ")", verbose);
                 }
             }
             if (!toManage.isEmpty()) {
                 print("  Managing bundle:", verbose);
                 for (Bundle bundle : toManage) {
-                    print("    " + bundle.getSymbolicName() + " / " + bundle.getVersion(), verbose);
+                    print("    " + bundle.getSymbolicName() + "/" + bundle.getVersion(), verbose);
                 }
             }
             return;
@@ -589,7 +589,7 @@ public class Deployer {
             while (!toStop.isEmpty()) {
                 List<Bundle> bs = getBundlesToStop(toStop);
                 for (Bundle bundle : bs) {
-                    print("  " + bundle.getSymbolicName() + " / " + bundle.getVersion(), verbose);
+                    print("  " + bundle.getSymbolicName() + "/" + bundle.getVersion(), verbose);
                     // If the bundle start level will be changed, stop it persistently to
                     // avoid a restart when the start level is actually changed
                     callback.stopBundle(bundle, toUpdateStartLevel.containsKey(bundle) ? 0 : STOP_TRANSIENT);
@@ -613,7 +613,7 @@ public class Deployer {
                 String name = entry.getKey();
                 Deployer.RegionDeployment regionDeployment = entry.getValue();
                 for (Bundle bundle : regionDeployment.toDelete) {
-                    print("  " + bundle.getSymbolicName() + " / " + bundle.getVersion(), verbose);
+                    print("  " + bundle.getSymbolicName() + "/" + bundle.getVersion(), verbose);
                     callback.uninstall(bundle);
                     removeFromMapSet(managedBundles, name, bundle.getBundleId());
                 }
@@ -787,7 +787,7 @@ public class Deployer {
                 while (!toStop.isEmpty()) {
                     List<Bundle> bs = getBundlesToStop(toStop);
                     for (Bundle bundle : bs) {
-                        print("  " + bundle.getSymbolicName() + " / " + bundle.getVersion(), verbose);
+                        print("  " + bundle.getSymbolicName() + "/" + bundle.getVersion(), verbose);
                         callback.stopBundle(bundle, STOP_TRANSIENT);
                         toStop.remove(bundle);
                         toStart.add(bundle);
@@ -799,7 +799,7 @@ public class Deployer {
                 print("Refreshing bundles:", verbose);
                 for (Map.Entry<Bundle, String> entry : toRefresh.entrySet()) {
                     Bundle bundle = entry.getKey();
-                    print("    " + bundle.getSymbolicName() + " / " + bundle.getVersion() + " (" + entry.getValue() + ")", verbose);
+                    print("    " + bundle.getSymbolicName() + "/" + bundle.getVersion() + " (" + entry.getValue() + ")", verbose);
                 }
                 // Ensure all classes are loaded in case the bundle will be refreshed
                 if (dstate.serviceBundle != null && toRefresh.containsKey(dstate.serviceBundle)) {
@@ -825,7 +825,7 @@ public class Deployer {
             while (!toStart.isEmpty()) {
                 List<Bundle> bs = getBundlesToStart(toStart, dstate.serviceBundle);
                 for (Bundle bundle : bs) {
-                    print("  " + bundle.getSymbolicName() + " / " + bundle.getVersion(), verbose);
+                    print("  " + bundle.getSymbolicName() + "/" + bundle.getVersion(), verbose);
                     try {
                         callback.startBundle(bundle);
                     } catch (BundleException e) {
@@ -1060,13 +1060,13 @@ public class Deployer {
             if (!deployment.toDelete.isEmpty()) {
                 print("    Bundles to uninstall:", verbose);
                 for (Bundle bundle : deployment.toDelete) {
-                    print("      " + bundle.getSymbolicName() + " / " + bundle.getVersion(), verbose);
+                    print("      " + bundle.getSymbolicName() + "/" + bundle.getVersion(), verbose);
                 }
             }
             if (!deployment.toUpdate.isEmpty()) {
                 print("    Bundles to update:", verbose);
                 for (Map.Entry<Bundle, Resource> entry : deployment.toUpdate.entrySet()) {
-                    print("      " + entry.getKey().getSymbolicName() + " / " + entry.getKey().getVersion() + " with " + getUri(entry.getValue()), verbose);
+                    print("      " + entry.getKey().getSymbolicName() + "/" + entry.getKey().getVersion() + " with " + getUri(entry.getValue()), verbose);
                 }
             }
             if (!deployment.toInstall.isEmpty()) {