You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by cs...@apache.org on 2017/06/05 15:35:28 UTC

[2/3] aries-jax-rs-whiteboard git commit: imerge order

imerge order


Project: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/commit/c932f09a
Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/c932f09a
Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/c932f09a

Branch: refs/heads/master
Commit: c932f09aee3a0bd66628652aec2639d597d3e568
Parents: 32396a8
Author: Carlos Sierra <cs...@apache.org>
Authored: Mon Jun 5 16:26:17 2017 +0200
Committer: Carlos Sierra <cs...@apache.org>
Committed: Mon Jun 5 16:26:39 2017 +0200

----------------------------------------------------------------------
 .../jax/rs/whiteboard/internal/CXFJaxRsServiceRegistrator.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c932f09a/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/CXFJaxRsServiceRegistrator.java
----------------------------------------------------------------------
diff --git a/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/CXFJaxRsServiceRegistrator.java b/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/CXFJaxRsServiceRegistrator.java
index 57e095a..e1e6a25 100644
--- a/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/CXFJaxRsServiceRegistrator.java
+++ b/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/CXFJaxRsServiceRegistrator.java
@@ -82,7 +82,8 @@ public class CXFJaxRsServiceRegistrator {
         return properties;
     }
 
-    public void add(ResourceInformation resourceInformation) {
+    public void add(
+        ResourceInformation<ServiceReference<?>> resourceInformation) {
         if (_closed) {
             return;
         }
@@ -114,7 +115,8 @@ public class CXFJaxRsServiceRegistrator {
         _closed = true;
     }
 
-    public void remove(ResourceInformation resourceInformation) {
+    public void remove(
+        ResourceInformation<ServiceReference<?>> resourceInformation) {
         if (_closed) {
             return;
         }