You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oozie.apache.org by an...@apache.org on 2018/05/24 07:57:41 UTC

oozie git commit: OOZIE-2883 ProxyUserService: invalid configuration error message is misleading (yangfang via andras.piros)

Repository: oozie
Updated Branches:
  refs/heads/master 526dbd198 -> b4bbc46f8


OOZIE-2883 ProxyUserService: invalid configuration error message is misleading (yangfang via andras.piros)


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

Branch: refs/heads/master
Commit: b4bbc46f884d3970c1448721ff539adfe308efb5
Parents: 526dbd1
Author: Andras Piros <an...@cloudera.com>
Authored: Thu May 24 09:56:56 2018 +0200
Committer: Andras Piros <an...@cloudera.com>
Committed: Thu May 24 09:56:56 2018 +0200

----------------------------------------------------------------------
 .../src/main/java/org/apache/oozie/service/ProxyUserService.java | 4 ++--
 release-log.txt                                                  | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/oozie/blob/b4bbc46f/core/src/main/java/org/apache/oozie/service/ProxyUserService.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/oozie/service/ProxyUserService.java b/core/src/main/java/org/apache/oozie/service/ProxyUserService.java
index 39b5774..4bfd527 100644
--- a/core/src/main/java/org/apache/oozie/service/ProxyUserService.java
+++ b/core/src/main/java/org/apache/oozie/service/ProxyUserService.java
@@ -79,7 +79,7 @@ public class ProxyUserService implements Service {
             if (key.startsWith(CONF_PREFIX) && key.endsWith(GROUPS)) {
                 String proxyUser = key.substring(0, key.lastIndexOf(GROUPS));
                 if (services.getConf().get(proxyUser + HOSTS) == null) {
-                    throw new ServiceException(ErrorCode.E0551, CONF_PREFIX + proxyUser + HOSTS);
+                    throw new ServiceException(ErrorCode.E0551, proxyUser + HOSTS);
                 }
                 proxyUser = proxyUser.substring(CONF_PREFIX.length());
                 String value = entry.getValue().trim();
@@ -93,7 +93,7 @@ public class ProxyUserService implements Service {
             if (key.startsWith(CONF_PREFIX) && key.endsWith(HOSTS)) {
                 String proxyUser = key.substring(0, key.lastIndexOf(HOSTS));
                 if (services.getConf().get(proxyUser + GROUPS) == null) {
-                    throw new ServiceException(ErrorCode.E0551, CONF_PREFIX + proxyUser + GROUPS);
+                    throw new ServiceException(ErrorCode.E0551, proxyUser + GROUPS);
                 }
                 proxyUser = proxyUser.substring(CONF_PREFIX.length());
                 String value = entry.getValue().trim();

http://git-wip-us.apache.org/repos/asf/oozie/blob/b4bbc46f/release-log.txt
----------------------------------------------------------------------
diff --git a/release-log.txt b/release-log.txt
index 8cb8c3d..d211450 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -1,5 +1,6 @@
 -- Oozie 5.1.0 release (trunk - unreleased)
 
+OOZIE-2883 ProxyUserService: invalid configuration error message is misleading (yangfang via andras.piros)
 OOZIE-3237 Flaky test TestZKLocksService#testWriteReadLockThreads (pbacsko via andras.piros)
 OOZIE-3251 Disable JMX for ActiveMQ in the tests (pbacsko)
 OOZIE-2826 Upgrade joda-time to 2.9.9 (dbist13 via andras.piros)