ranger-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mad...@apache.org
Subject incubator-ranger git commit: RANGER-969: fix mis-spelled configuration name: delimiterer to delimiter
Date Thu, 05 May 2016 16:06:47 GMT
Repository: incubator-ranger
Updated Branches:
  refs/heads/master b4157cfa1 -> d58bda23c


RANGER-969: fix mis-spelled configuration name: delimiterer to delimiter

Signed-off-by: Madhan Neethiraj <madhan@apache.org>


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

Branch: refs/heads/master
Commit: d58bda23cb8ccbd9b186f49cd8b8e3e53cf9f6aa
Parents: b4157cf
Author: Bryan Bende <bbende@apache.org>
Authored: Thu May 5 10:05:11 2016 -0400
Committer: Madhan Neethiraj <madhan@apache.org>
Committed: Thu May 5 08:57:24 2016 -0700

----------------------------------------------------------------------
 .../ranger/unixusersync/config/UserGroupSyncConfig.java     | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/d58bda23/ugsync/src/main/java/org/apache/ranger/unixusersync/config/UserGroupSyncConfig.java
----------------------------------------------------------------------
diff --git a/ugsync/src/main/java/org/apache/ranger/unixusersync/config/UserGroupSyncConfig.java
b/ugsync/src/main/java/org/apache/ranger/unixusersync/config/UserGroupSyncConfig.java
index 9321e6e..59463ca 100644
--- a/ugsync/src/main/java/org/apache/ranger/unixusersync/config/UserGroupSyncConfig.java
+++ b/ugsync/src/main/java/org/apache/ranger/unixusersync/config/UserGroupSyncConfig.java
@@ -69,8 +69,9 @@ public class UserGroupSyncConfig  {
 	public static final String  UGSYNC_MOCK_RUN_PROP  = 	"ranger.usersync.policymanager.mockrun"
;
 	
 	public static final String UGSYNC_SOURCE_FILE_PROC =	"ranger.usersync.filesource.file";
-	
-	public static final String UGSYNC_SOURCE_FILE_DELIMITER = "ranger.usersync.filesource.text.delimiterer";
+
+	public static final String UGSYNC_SOURCE_FILE_DELIMITER = "ranger.usersync.filesource.text.delimiter";
+	public static final String UGSYNC_SOURCE_FILE_DELIMITERER = "ranger.usersync.filesource.text.delimiterer";
 	
 	private static final String SSL_KEYSTORE_PATH_PARAM = "ranger.usersync.keystore.file" ;
 
@@ -344,6 +345,10 @@ public class UserGroupSyncConfig  {
 	
 	public String getUserSyncFileSourceDelimiter(){
 		String val = prop.getProperty(UGSYNC_SOURCE_FILE_DELIMITER) ;
+		if (val == null) {
+			val = prop.getProperty(UGSYNC_SOURCE_FILE_DELIMITERER);
+		}
+
 		if ( val == null) {
 			val = DEFAULT_USER_GROUP_TEXTFILE_DELIMITER;
 		}


Mime
View raw message