You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tamaya.apache.org by po...@apache.org on 2017/10/09 19:54:16 UTC
incubator-tamaya-sandbox git commit: TAMAYA-315: Use non-deprecated
reference to policy
Repository: incubator-tamaya-sandbox
Updated Branches:
refs/heads/master 738be50e5 -> bc4a6ad79
TAMAYA-315: Use non-deprecated reference to policy
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/commit/bc4a6ad7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/tree/bc4a6ad7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/diff/bc4a6ad7
Branch: refs/heads/master
Commit: bc4a6ad79f555d16c1afde6ece0c71ee6e72082d
Parents: 738be50
Author: Phil Ottlinger <po...@apache.org>
Authored: Mon Oct 9 21:53:33 2017 +0200
Committer: Phil Ottlinger <po...@apache.org>
Committed: Mon Oct 9 21:53:33 2017 +0200
----------------------------------------------------------------------
.../apache/tamaya/collections/AdaptiveCombinationPolicy.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/bc4a6ad7/collections/src/main/java/org/apache/tamaya/collections/AdaptiveCombinationPolicy.java
----------------------------------------------------------------------
diff --git a/collections/src/main/java/org/apache/tamaya/collections/AdaptiveCombinationPolicy.java b/collections/src/main/java/org/apache/tamaya/collections/AdaptiveCombinationPolicy.java
index f10f7ec..a608a11 100644
--- a/collections/src/main/java/org/apache/tamaya/collections/AdaptiveCombinationPolicy.java
+++ b/collections/src/main/java/org/apache/tamaya/collections/AdaptiveCombinationPolicy.java
@@ -40,7 +40,7 @@ public class AdaptiveCombinationPolicy implements PropertyValueCombinationPolicy
private static final Logger LOG = Logger.getLogger(AdaptiveCombinationPolicy.class.getName());
/**
- * Collecting combination policy using (optional) {@code item-separator} parameter for determining the sparator
+ * Collecting combination policy using (optional) {@code item-separator} parameter for determining the separator
* to combine multiple config entries found.
*/
private static final PropertyValueCombinationPolicy COLLECTING_POLICY = new PropertyValueCombinationPolicy(){
@@ -96,7 +96,7 @@ public class AdaptiveCombinationPolicy implements PropertyValueCombinationPolicy
if(LOG.isLoggable(Level.FINEST)){
LOG.finest("Using default (overriding) combination policy for key: " + key + "");
}
- combinationPolicy = PropertyValueCombinationPolicy.DEFAULT_OVERRIDING_COLLECTOR;
+ combinationPolicy = PropertyValueCombinationPolicy.DEFAULT_OVERRIDING_POLICY;
break;
default:
try{
@@ -114,7 +114,7 @@ public class AdaptiveCombinationPolicy implements PropertyValueCombinationPolicy
} catch(Exception e){
LOG.log(Level.SEVERE, "Error loading configured PropertyValueCombinationPolicy for " +
"key: " + key + ", using default (overriding) policy.", e);
- combinationPolicy = PropertyValueCombinationPolicy.DEFAULT_OVERRIDING_COLLECTOR;
+ combinationPolicy = PropertyValueCombinationPolicy.DEFAULT_OVERRIDING_POLICY;
}
}
return combinationPolicy.collect(currentValue, key, propertySource);