You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by ke...@apache.org on 2022/10/10 01:34:44 UTC
[dolphinscheduler] branch dev updated: fix this issue (#12281)
This is an automated email from the ASF dual-hosted git repository.
kerwin pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push:
new b4947b471c fix this issue (#12281)
b4947b471c is described below
commit b4947b471cad5d4b939f5a5f4a978c786c4decdc
Author: calvin <ji...@163.com>
AuthorDate: Mon Oct 10 09:34:32 2022 +0800
fix this issue (#12281)
---
.../org/apache/dolphinscheduler/api/service/impl/UsersServiceImpl.java | 3 +--
.../org/apache/dolphinscheduler/common/config/StoreConfiguration.java | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/UsersServiceImpl.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/UsersServiceImpl.java
index b2749a255d..86f2d7a3dd 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/UsersServiceImpl.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/UsersServiceImpl.java
@@ -144,7 +144,7 @@ public class UsersServiceImpl extends BaseServiceImpl implements UsersService {
* @throws Exception exception
*/
@Override
- @Transactional
+ @Transactional(rollbackFor = Exception.class)
public Map<String, Object> createUser(User loginUser,
String userName,
String userPassword,
@@ -190,7 +190,6 @@ public class UsersServiceImpl extends BaseServiceImpl implements UsersService {
result.put(Constants.DATA_LIST, user);
putMsg(result, Status.SUCCESS);
return result;
-
}
@Override
diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/config/StoreConfiguration.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/config/StoreConfiguration.java
index 06a685ea06..871bd7e104 100644
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/config/StoreConfiguration.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/config/StoreConfiguration.java
@@ -42,7 +42,7 @@ public class StoreConfiguration {
@Bean
public StorageOperate storageOperate() {
- switch (PropertyUtils.getString(RESOURCE_STORAGE_TYPE)) {
+ switch (PropertyUtils.getUpperCaseString(RESOURCE_STORAGE_TYPE)) {
case STORAGE_OSS:
OssOperator ossOperator = new OssOperator();
// TODO: change to use ossOperator.init(ossConnection) after DS supports Configuration / Connection