Merge pull request #3310 from mingshewhe/bug_3288_1.2

fix: ScmFactory对svn的region字段不合理的使用 #3288
TencentBlueKing · Dec 17, 2020 · 7dcca23 · 7dcca23
2 parents d836dca + b6e4651
commit 7dcca23
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 16 deletions.
diff --git a/src/backend/ci/core/common/common-scm/src/main/kotlin/com/tencent/devops/scm/ScmFactory.kt b/src/backend/ci/core/common/common-scm/src/main/kotlin/com/tencent/devops/scm/ScmFactory.kt
@@ -56,13 +56,6 @@ object ScmFactory {
     ): IScm {
         return when (type) {
             ScmType.CODE_SVN -> {
-                if (region == null) {
-                    throw TaskExecuteException(
-                        errorCode = ErrorCode.USER_RESOURCE_NOT_FOUND,
-                        errorType = ErrorType.USER,
-                        errorMsg = "The svn region is null"
-                    )
-                }
 
                 if (userName == null) {
                     throw TaskExecuteException(
@@ -168,4 +161,4 @@ object ScmFactory {
             )
         }
     }
-}
+}
diff --git a/...ckend/ci/core/common/common-scm/src/main/kotlin/com/tencent/devops/scm/ScmOauthFactory.kt b/...ckend/ci/core/common/common-scm/src/main/kotlin/com/tencent/devops/scm/ScmOauthFactory.kt
@@ -54,13 +54,6 @@ object ScmOauthFactory {
     ): IScm {
         return when (type) {
             ScmType.CODE_SVN -> {
-                if (region == null) {
-                    throw TaskExecuteException(
-                        errorCode = ErrorCode.USER_INPUT_INVAILD,
-                        errorType = ErrorType.USER,
-                        errorMsg = "The svn region is null"
-                    )
-                }
 
                 if (userName == null) {
                     throw TaskExecuteException(
@@ -126,4 +119,4 @@ object ScmOauthFactory {
             )
         }
     }
-}
+}