aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From csie...@apache.org
Subject [02/11] aries-jax-rs-whiteboard git commit: Revert "imerge order"
Date Mon, 19 Jun 2017 15:34:06 GMT
Revert "imerge order"

This reverts commit c932f09aee3a0bd66628652aec2639d597d3e568.


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/3f442911
Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/3f442911
Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/3f442911

Branch: refs/heads/master
Commit: 3f442911cdecd93c295dbc3ecd826d7cd3f05652
Parents: f420f97
Author: Carlos Sierra <csierra@apache.org>
Authored: Mon Jun 19 17:30:26 2017 +0200
Committer: Carlos Sierra <csierra@apache.org>
Committed: Mon Jun 19 17:30:26 2017 +0200

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


http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/3f442911/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 e1e6a25..57e095a 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,8 +82,7 @@ public class CXFJaxRsServiceRegistrator {
         return properties;
     }
 
-    public void add(
-        ResourceInformation<ServiceReference<?>> resourceInformation) {
+    public void add(ResourceInformation resourceInformation) {
         if (_closed) {
             return;
         }
@@ -115,8 +114,7 @@ public class CXFJaxRsServiceRegistrator {
         _closed = true;
     }
 
-    public void remove(
-        ResourceInformation<ServiceReference<?>> resourceInformation) {
+    public void remove(ResourceInformation resourceInformation) {
         if (_closed) {
             return;
         }


Mime
View raw message