code simplification
git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/trunk@1595666 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/main/java/org/apache/maven/plugins/scmpublish/AbstractScmPublishMojo.java b/src/main/java/org/apache/maven/plugins/scmpublish/AbstractScmPublishMojo.java
index 62179e9..a7bf8d2 100644
--- a/src/main/java/org/apache/maven/plugins/scmpublish/AbstractScmPublishMojo.java
+++ b/src/main/java/org/apache/maven/plugins/scmpublish/AbstractScmPublishMojo.java
@@ -401,18 +401,12 @@
{
ScmFileSet fileSet = new ScmFileSet( checkoutDirectory, includes, excludes );
+ ScmBranch branch = ( scmBranch == null ) ? null : new ScmBranch( scmBranch );
+
ScmResult scmResult = null;
if ( tryUpdate && !forceCheckout )
{
- if ( scmBranch == null )
- {
- scmResult = scmProvider.update( scmRepository, fileSet );
- }
- else
- {
- ScmBranch scmBranch = new ScmBranch( this.scmBranch );
- scmResult = scmProvider.update( scmRepository, fileSet, scmBranch );
- }
+ scmResult = scmProvider.update( scmRepository, fileSet, branch );
}
else
{
@@ -421,15 +415,7 @@
{
try
{
- if ( scmBranch == null )
- {
- scmResult = scmProvider.checkOut( scmRepository, fileSet );
- }
- else
- {
- ScmBranch scmBranch = new ScmBranch( this.scmBranch );
- scmResult = scmProvider.checkOut( scmRepository, fileSet, scmBranch );
- }
+ scmResult = scmProvider.checkOut( scmRepository, fileSet, branch );
}
catch ( ScmException e )
{
