cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject cxf git commit: Fixing 3.1.x compilation failure
Date Thu, 14 Apr 2016 15:19:43 GMT
Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 11f3e36e1 -> e5a5d5b64


Fixing 3.1.x compilation failure


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/e5a5d5b6
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/e5a5d5b6
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/e5a5d5b6

Branch: refs/heads/3.1.x-fixes
Commit: e5a5d5b64015faffa3479ac009631c66f9f56036
Parents: 11f3e36
Author: Sergey Beryozkin <sberyozkin@gmail.com>
Authored: Thu Apr 14 16:19:21 2016 +0100
Committer: Sergey Beryozkin <sberyozkin@gmail.com>
Committed: Thu Apr 14 16:19:21 2016 +0100

----------------------------------------------------------------------
 .../org/apache/cxf/jaxrs/provider/ProviderCache.java    | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/e5a5d5b6/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderCache.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderCache.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderCache.java
index 37aeb7b..15fdd03 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderCache.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderCache.java
@@ -51,7 +51,11 @@ public class ProviderCache {
         String key = getKey(type, mt);
 
         List<ProviderInfo<MessageBodyReader<?>>> list = readerProviderCache.get(key);
-        return list != null ? list : Collections.emptyList();
+        if (list != null) {
+            return list;
+        } else {
+            return Collections.emptyList();
+        }
     }
     public List<ProviderInfo<MessageBodyWriter<?>>> getWriters(Class<?>
type, MediaType mt) {
         if (writerProviderCache.isEmpty()) {
@@ -61,7 +65,11 @@ public class ProviderCache {
         String key = getKey(type, mt);
 
         List<ProviderInfo<MessageBodyWriter<?>>> list = writerProviderCache.get(key);
-        return list != null ? list : Collections.emptyList();
+        if (list != null) {
+            return list;
+        } else {
+            return Collections.emptyList();
+        }
     }
 
     public void putReaders(Class<?> type, MediaType mt, List<ProviderInfo<MessageBodyReader<?>>>
candidates) {


Mime
View raw message