tamaya-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anat...@apache.org
Subject [5/5] incubator-tamaya git commit: Fixed Javadocs.
Date Tue, 13 Oct 2015 01:11:47 GMT
Fixed Javadocs.


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

Branch: refs/heads/master
Commit: c03591d3b423fa377ebd02976a3912abd0b4e7ba
Parents: 6815195
Author: anatole <anatole@apache.org>
Authored: Tue Oct 13 03:10:34 2015 +0200
Committer: anatole <anatole@apache.org>
Committed: Tue Oct 13 03:10:34 2015 +0200

----------------------------------------------------------------------
 .../apache/tamaya/integration/cdi/ConfigurationExtension.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/c03591d3/modules/integration/cdi/src/main/java/org/apache/tamaya/integration/cdi/ConfigurationExtension.java
----------------------------------------------------------------------
diff --git a/modules/integration/cdi/src/main/java/org/apache/tamaya/integration/cdi/ConfigurationExtension.java
b/modules/integration/cdi/src/main/java/org/apache/tamaya/integration/cdi/ConfigurationExtension.java
index b421cbc..c02bff2 100644
--- a/modules/integration/cdi/src/main/java/org/apache/tamaya/integration/cdi/ConfigurationExtension.java
+++ b/modules/integration/cdi/src/main/java/org/apache/tamaya/integration/cdi/ConfigurationExtension.java
@@ -213,14 +213,17 @@ public class ConfigurationExtension implements Extension {
      * The effective keys are then combined with the sections given (if any) and only, if
the given keys are not
      * absolute keys (surrounded by brackets).
      * @param memberName the default member name, not null.
-     * @param keys the keys, may be empty, but not null.
+     * @param keys the keys, may be empty, or null.
      * @param sections the default sections, may be empty. May also be null.
      * @return the list of keys to be finally used for configuration resolution in order
of
      * precedence. The first keys in the list that could be successfully resolved define
the final
      * configuration value.
      */
     public static List<String> evaluateKeys(String memberName, String[] keys, String[]
sections) {
-        List<String> effKeys = new ArrayList<>(Arrays.asList(keys));
+        List<String> effKeys = new ArrayList<>();
+        if(keys!=null){
+            effKeys.addAll(Arrays.asList(keys));
+        }
         if (effKeys.isEmpty()) {
             effKeys.add(memberName);
         }


Mime
View raw message