TAMAYA-149: Fixed invalid return on URL resolver. Added possibility to replace 
unresolved values with just an empty String as return value.


Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/commit/770dc1b4
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/770dc1b4
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/770dc1b4

Branch: refs/heads/master
Commit: 770dc1b40e5f167afff13764713aabd1e8c6ad45
Parents: 777cc10
Author: anatole <anat...@apache.org>
Authored: Thu May 5 18:47:57 2016 +0200
Committer: anatole <anat...@apache.org>
Committed: Thu May 5 18:47:57 2016 +0200

----------------------------------------------------------------------
 .../java/org/apache/tamaya/inject/internal/InjectionHelper.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/770dc1b4/injection/src/main/java/org/apache/tamaya/inject/internal/InjectionHelper.java
----------------------------------------------------------------------
diff --git 
a/injection/src/main/java/org/apache/tamaya/inject/internal/InjectionHelper.java
 
b/injection/src/main/java/org/apache/tamaya/inject/internal/InjectionHelper.java
index 418d51b..ee978a5 100644
--- 
a/injection/src/main/java/org/apache/tamaya/inject/internal/InjectionHelper.java
+++ 
b/injection/src/main/java/org/apache/tamaya/inject/internal/InjectionHelper.java
@@ -226,7 +226,7 @@ final class InjectionHelper {
         }
         ExpressionEvaluator evaluator = 
ServiceContextManager.getServiceContext().getService(ExpressionEvaluator.class);
         if (evaluator != null) {
-            return evaluator.evaluateExpression("<injection>", expression);
+            return evaluator.evaluateExpression("<injection>", expression, 
maskNotFound);
         }
         return expression;
     }

Reply via email to