[cxf] branch 3.1.x-fixes updated: [CXF-7630] One more minor update

[se...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

sergeyb pushed a commit to branch 3.1.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git


The following commit(s) were added to refs/heads/3.1.x-fixes by this push:
     new 5a2a78e  [CXF-7630] One more minor update
5a2a78e is described below

commit 5a2a78ebb19391b6b46a5a62ec705ad788a5a6c1
Author: Sergey Beryozkin <sb...@gmail.com>
AuthorDate: Fri Feb 2 13:09:06 2018 +0000

    [CXF-7630] One more minor update
---
 .../main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java
index 7d12c57..7bb9dbe 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java
@@ -1235,11 +1235,11 @@ public abstract class ProviderFactory {
     }
     
     protected static Set<String> getFilterNameBindings(ProviderInfo<?> p) {
-        Set<String> names = null;
         if (p instanceof FilterProviderInfo) {
-            names = ((FilterProviderInfo<?>)p).getNameBindings();
-        } 
-        return names == null ? getFilterNameBindings(p.getBus(), p.getProvider()) : names;
+            return ((FilterProviderInfo<?>)p).getNameBindings();
+        } else {
+            return getFilterNameBindings(p.getBus(), p.getProvider());
+        }
         
     }
     protected static Set<String> getFilterNameBindings(Bus bus, Object provider) {

-- 
To stop receiving notification emails like this one, please contact
sergeyb@apache.org.