Return-Path: X-Original-To: apmail-aries-commits-archive@www.apache.org Delivered-To: apmail-aries-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 EF3BE11D02 for ; Mon, 2 Jun 2014 12:55:23 +0000 (UTC) Received: (qmail 55828 invoked by uid 500); 2 Jun 2014 12:55:23 -0000 Delivered-To: apmail-aries-commits-archive@aries.apache.org Received: (qmail 55753 invoked by uid 500); 2 Jun 2014 12:55:23 -0000 Mailing-List: contact commits-help@aries.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@aries.apache.org Delivered-To: mailing list commits@aries.apache.org Received: (qmail 55743 invoked by uid 99); 2 Jun 2014 12:55:23 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 Jun 2014 12:55:23 +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; Mon, 02 Jun 2014 12:55:22 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 3B646238890D; Mon, 2 Jun 2014 12:55:02 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1599198 - /aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/ApplicationServiceModeller.java Date: Mon, 02 Jun 2014 12:55:02 -0000 To: commits@aries.apache.org From: mnuttall@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140602125502.3B646238890D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mnuttall Date: Mon Jun 2 12:55:01 2014 New Revision: 1599198 URL: http://svn.apache.org/r1599198 Log: Aries-1196: Service dependency model may create filters with null objectClass. From a patch by Tom Watson. Modified: aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/ApplicationServiceModeller.java Modified: aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/ApplicationServiceModeller.java URL: http://svn.apache.org/viewvc/aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/ApplicationServiceModeller.java?rev=1599198&r1=1599197&r2=1599198&view=diff ============================================================================== --- aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/ApplicationServiceModeller.java (original) +++ aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/ApplicationServiceModeller.java Mon Jun 2 12:55:01 2014 @@ -51,26 +51,39 @@ public class ApplicationServiceModeller .build()); } for (ImportedService service : elements.getReferences()) { - StringBuilder builder = new StringBuilder("(&(") + StringBuilder builder = new StringBuilder(); + String serviceInterface = service.getInterface(); + String filter = service.getFilter(); + + if (serviceInterface != null && filter != null) { + builder.append("(&"); + } + if (serviceInterface != null) { + builder.append('(') .append(ServiceNamespace.CAPABILITY_OBJECTCLASS_ATTRIBUTE) .append('=') - .append(service.getInterface()) + .append(serviceInterface) .append(')'); - String filter = service.getFilter(); + } + if (filter != null) builder.append(filter); - builder.append(')'); - model.requirements.add(new BasicRequirement.Builder() - .namespace(ServiceNamespace.SERVICE_NAMESPACE) - .directive(Namespace.REQUIREMENT_FILTER_DIRECTIVE, builder.toString()) - .directive( - Namespace.REQUIREMENT_RESOLUTION_DIRECTIVE, - service.isOptional() ? Namespace.RESOLUTION_OPTIONAL : Namespace.RESOLUTION_MANDATORY) - .directive( - Namespace.REQUIREMENT_CARDINALITY_DIRECTIVE, - service.isMultiple() ? Namespace.CARDINALITY_MULTIPLE : Namespace.CARDINALITY_SINGLE) - .resource(resource) - .build()); + if (serviceInterface != null && filter != null) { + builder.append(')'); + } + if (builder.length() > 0) { + model.requirements.add(new BasicRequirement.Builder() + .namespace(ServiceNamespace.SERVICE_NAMESPACE) + .directive(Namespace.REQUIREMENT_FILTER_DIRECTIVE, builder.toString()) + .directive( + Namespace.REQUIREMENT_RESOLUTION_DIRECTIVE, + service.isOptional() ? Namespace.RESOLUTION_OPTIONAL : Namespace.RESOLUTION_MANDATORY) + .directive( + Namespace.REQUIREMENT_CARDINALITY_DIRECTIVE, + service.isMultiple() ? Namespace.CARDINALITY_MULTIPLE : Namespace.CARDINALITY_SINGLE) + .resource(resource) + .build()); + } } return model; } catch (ModellerException e) {