felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r1612826 - /felix/trunk/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/security/SecureEventAdminFactory.java
Date Wed, 23 Jul 2014 12:42:15 GMT
Author: cziegeler
Date: Wed Jul 23 12:42:15 2014
New Revision: 1612826

URL: http://svn.apache.org/r1612826
Log:
FELIX-3511 - Use java.concurrent from Java 6

Modified:
    felix/trunk/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/security/SecureEventAdminFactory.java

Modified: felix/trunk/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/security/SecureEventAdminFactory.java
URL: http://svn.apache.org/viewvc/felix/trunk/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/security/SecureEventAdminFactory.java?rev=1612826&r1=1612825&r2=1612826&view=diff
==============================================================================
--- felix/trunk/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/security/SecureEventAdminFactory.java
(original)
+++ felix/trunk/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/security/SecureEventAdminFactory.java
Wed Jul 23 12:42:15 2014
@@ -18,7 +18,9 @@
  */
 package org.apache.felix.eventadmin.impl.security;
 
-import org.osgi.framework.*;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.ServiceFactory;
+import org.osgi.framework.ServiceRegistration;
 import org.osgi.service.event.EventAdmin;
 
 /**
@@ -30,7 +32,7 @@ import org.osgi.service.event.EventAdmin
  *
  * @author <a href="mailto:dev@felix.apache.org">Felix Project Team</a>
  */
-public class SecureEventAdminFactory implements ServiceFactory
+public class SecureEventAdminFactory implements ServiceFactory<EventAdmin>
 {
     // The EventAdmin to secure
     private final EventAdmin m_admin;
@@ -62,8 +64,9 @@ public class SecureEventAdminFactory imp
      * @see org.osgi.framework.ServiceFactory#getService(org.osgi.framework.Bundle,
      *      org.osgi.framework.ServiceRegistration)
      */
-    public Object getService(final Bundle bundle,
-        final ServiceRegistration registration)
+    @Override
+    public EventAdmin getService(final Bundle bundle,
+        final ServiceRegistration<EventAdmin> registration)
     {
         // We don't need to cache this objects since the framework already does this.
         return new EventAdminSecurityDecorator(bundle, m_admin);
@@ -79,8 +82,9 @@ public class SecureEventAdminFactory imp
      * @see org.osgi.framework.ServiceFactory#ungetService(org.osgi.framework.Bundle,
      *      org.osgi.framework.ServiceRegistration, java.lang.Object)
      */
+    @Override
     public void ungetService(final Bundle bundle,
-        final ServiceRegistration registration, final Object service)
+        final ServiceRegistration<EventAdmin> registration, final EventAdmin service)
     {
         // We don't need to do anything here since we hand-out a new instance with
         // any call to getService hence, it is o.k. to just wait for the next gc.



Mime
View raw message