Author: [email protected]
Date: Tue Feb 7 16:40:43 2012
New Revision: 2069
Log:
AMDATU-550: remove unnecessary framework calls/cleanups.
Modified:
trunk/amdatu-core/tenant-adapter/src/main/java/org/amdatu/tenant/adapter/TenantAdapter.java
trunk/amdatu-core/tenant-adapter/src/main/java/org/amdatu/tenant/adapter/TenantAwareBundleContext.java
Modified:
trunk/amdatu-core/tenant-adapter/src/main/java/org/amdatu/tenant/adapter/TenantAdapter.java
==============================================================================
---
trunk/amdatu-core/tenant-adapter/src/main/java/org/amdatu/tenant/adapter/TenantAdapter.java
(original)
+++
trunk/amdatu-core/tenant-adapter/src/main/java/org/amdatu/tenant/adapter/TenantAdapter.java
Tue Feb 7 16:40:43 2012
@@ -81,11 +81,6 @@
catch (Exception e) {
m_log.log(LogService.LOG_ERROR, "Could not stop activator for
tenant " + getTenantID(), e);
}
- finally {
- // Make sure we unregister all services that were registered using
this bundle
- // context, and also remove any listeners that were installed! See
AMDATU-550.
- m_tenantAwareBundleContext.unregisterServicesAndListeners();
- }
}
/**
Modified:
trunk/amdatu-core/tenant-adapter/src/main/java/org/amdatu/tenant/adapter/TenantAwareBundleContext.java
==============================================================================
---
trunk/amdatu-core/tenant-adapter/src/main/java/org/amdatu/tenant/adapter/TenantAwareBundleContext.java
(original)
+++
trunk/amdatu-core/tenant-adapter/src/main/java/org/amdatu/tenant/adapter/TenantAwareBundleContext.java
Tue Feb 7 16:40:43 2012
@@ -53,18 +53,15 @@
private static final long serialVersionUID = 1L;
- private Bundle m_eventBundle;
-
public ScopedFrameworkEvent(FrameworkEvent event) {
super(event.getType(), event.getBundle(), event.getThrowable());
- m_eventBundle = event.getBundle();
}
/**
* @see org.osgi.framework.FrameworkEvent#getBundle()
*/
public Bundle getBundle() {
- return new TenantAwareBundle(m_eventBundle);
+ return new TenantAwareBundle(super.getBundle());
}
}
@@ -117,18 +114,15 @@
private static final long serialVersionUID = 1L;
- private final Bundle m_eventBundle;
-
public TenantAwareBundleEvent(BundleEvent event) {
super(event.getType(), event.getBundle());
- m_eventBundle = event.getBundle();
}
/**
* @see org.osgi.framework.BundleEvent#getBundle()
*/
public Bundle getBundle() {
- return new TenantAwareBundle(m_eventBundle);
+ return new TenantAwareBundle(super.getBundle());
}
}
@@ -473,24 +467,6 @@
}
/**
- * Makes sure all remaining service registrations are cleaned up, and all
bundle/framework listeners are deregistered as well.
- */
- final void unregisterServicesAndListeners() {
- for (ServiceRegistration registration :
m_serviceRegistrations.values()) {
- registration.unregister();
- }
- m_serviceRegistrations.clear();
-
- for (BundleListener bundleListener : m_bundleListeners.keySet()) {
- removeBundleListener(bundleListener);
- }
-
- for (FrameworkListener fwListener : m_frameworkListeners.keySet()) {
- removeFrameworkListener(fwListener);
- }
- }
-
- /**
* @param scope
* @return
*/
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
