Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 7AA20200B84 for ; Mon, 29 Aug 2016 04:31:58 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 791BB160AC7; Mon, 29 Aug 2016 02:31:58 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id BFDD6160AB4 for ; Mon, 29 Aug 2016 04:31:57 +0200 (CEST) Received: (qmail 30156 invoked by uid 500); 29 Aug 2016 02:31:56 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 30147 invoked by uid 99); 29 Aug 2016 02:31:56 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 29 Aug 2016 02:31:56 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A2786E01D9; Mon, 29 Aug 2016 02:31:56 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ffang@apache.org To: commits@cxf.apache.org Message-Id: <599c9b6ba9514ae09b23eaf3a7e53abc@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: cxf git commit: [CXF-7026] o.a.c.transport.http.osgi.HttpServiceTrackerCust#removedService was not called Date: Mon, 29 Aug 2016 02:31:56 +0000 (UTC) archived-at: Mon, 29 Aug 2016 02:31:58 -0000 Repository: cxf Updated Branches: refs/heads/3.1.x-fixes 861541e23 -> 6c14b437f [CXF-7026] o.a.c.transport.http.osgi.HttpServiceTrackerCust#removedService was not called (cherry picked from commit 09712af17f75e9d81d05718e8270cc3741e276db) Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/6c14b437 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/6c14b437 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/6c14b437 Branch: refs/heads/3.1.x-fixes Commit: 6c14b437f2fadd1ab273455c0d6779e45180f642 Parents: 861541e Author: Grzegorz Grzybek Authored: Fri Aug 26 16:23:52 2016 +0200 Committer: Freeman Fang Committed: Mon Aug 29 10:30:02 2016 +0800 ---------------------------------------------------------------------- .../org/apache/cxf/transport/http/osgi/HttpServiceTrackerCust.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/6c14b437/rt/transports/http/src/main/java/org/apache/cxf/transport/http/osgi/HttpServiceTrackerCust.java ---------------------------------------------------------------------- diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/osgi/HttpServiceTrackerCust.java b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/osgi/HttpServiceTrackerCust.java index b1d6f51..fbf9035 100644 --- a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/osgi/HttpServiceTrackerCust.java +++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/osgi/HttpServiceTrackerCust.java @@ -68,6 +68,6 @@ final class HttpServiceTrackerCust implements ServiceTrackerCustomizer { servProps.put(Constants.SERVICE_PID, CXF_CONFIG_PID); servletPublisherReg = context.registerService(ManagedService.class.getName(), servletExporter, servProps); - return null; + return httpService; } } \ No newline at end of file