From fc9bfaf0f2d8d6555a7a581a9263795d0d2f05be Mon Sep 17 00:00:00 2001
From: Alex <alexander.suter@gmx.ch>
Date: Mon, 24 Sep 2018 18:08:53 +0200
Subject: [PATCH] /TAMAYA-352 Unpredictable behavior when a resolver can't
 resolve the value

---
 .../internal/DefaultExpressionEvaluator.java         | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/modules/resolver/src/main/java/org/apache/tamaya/resolver/internal/DefaultExpressionEvaluator.java b/modules/resolver/src/main/java/org/apache/tamaya/resolver/internal/DefaultExpressionEvaluator.java
index 20e289b9..9779f4cc 100644
--- a/modules/resolver/src/main/java/org/apache/tamaya/resolver/internal/DefaultExpressionEvaluator.java
+++ b/modules/resolver/src/main/java/org/apache/tamaya/resolver/internal/DefaultExpressionEvaluator.java
@@ -230,18 +230,6 @@ private String evaluateInternal(String unresolvedExpression, boolean maskUnresol
                 break;
             }
         }
-        if(value==null){
-            for(ExpressionResolver resolver:resolvers){
-                try{
-                    value = resolver.evaluate(unresolvedExpression);
-                    if(value!=null){
-                        return value;
-                    }
-                }catch(Exception e){
-                    LOG.log(Level.FINEST, "Error during expression resolution from " + resolver, e);
-                }
-            }
-        }
         if(value==null){
             LOG.log(Level.WARNING, "Unresolvable expression encountered " + unresolvedExpression);
             if(maskUnresolved){