Return-Path: X-Original-To: apmail-felix-commits-archive@www.apache.org Delivered-To: apmail-felix-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 3F21C1035D for ; Wed, 23 Jul 2014 12:42:39 +0000 (UTC) Received: (qmail 20846 invoked by uid 500); 23 Jul 2014 12:42:39 -0000 Delivered-To: apmail-felix-commits-archive@felix.apache.org Received: (qmail 20800 invoked by uid 500); 23 Jul 2014 12:42:39 -0000 Mailing-List: contact commits-help@felix.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@felix.apache.org Delivered-To: mailing list commits@felix.apache.org Received: (qmail 20767 invoked by uid 99); 23 Jul 2014 12:42:39 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 23 Jul 2014 12:42:39 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 23 Jul 2014 12:42:40 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 8B8542388906; Wed, 23 Jul 2014 12:42:15 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: commits@felix.apache.org From: cziegeler@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140723124215.8B8542388906@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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 Felix Project Team */ -public class SecureEventAdminFactory implements ServiceFactory +public class SecureEventAdminFactory implements ServiceFactory { // 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 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 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.