lib/fusuma/config/searcher.rb in fusuma-3.2.0 vs lib/fusuma/config/searcher.rb in fusuma-3.3.0

@@ -110,11 +110,11 @@
 
         # No context(primary context)
         # @return [Hash]
         # @return [NilClass]
         def no_context(_request_context, &block)
-          return {} if with_context({}, &block)
+          {} if with_context({}, &block)
         end
 
         # Complete match request context
         # @param request_context [Hash]
         # @return [Hash] matched context
@@ -163,10 +163,13 @@
               next
             end
 
             return config[:context] if with_context(config[:context], &block)
           end
-          complete_match_context
+          if complete_match_context
+            with_context(complete_match_context, &block)
+            complete_match_context
+          end
         end
       end
     end
   end
 end