Skip to content

Commit

Permalink
#115 and #111
Browse files Browse the repository at this point in the history
  • Loading branch information
greenlaw110 committed Mar 23, 2017
1 parent fa1e186 commit 5c0d3a7
Show file tree
Hide file tree
Showing 5 changed files with 407 additions and 83 deletions.
3 changes: 1 addition & 2 deletions src/main/java/act/conf/ConfigKeyHelper.java
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
import org.osgl.exception.NotAppliedException;
import org.osgl.logging.L;
import org.osgl.logging.Logger;
import org.osgl.util.C;
import org.osgl.util.S;

import java.io.File;
Expand Down Expand Up @@ -346,7 +345,7 @@ private Object getValFromAliases(Map<String, ?> configuration, String key, Strin
}

/*
* Check if v has variable e.g. `${foo.bar` inside and expand it recursively
* Check if v has variable e.g. `${foo.bar}` inside and expand it recursively
*/
public String evaluate(String s, Map<String, ?> map) {
int n = 0, n0 = 0, len = s.length();
Expand Down

0 comments on commit 5c0d3a7

Please sign in to comment.