You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by el...@apache.org on 2020/12/24 15:36:28 UTC

[maven-scm] 01/02: fix wrong argument type for equals

This is an automated email from the ASF dual-hosted git repository.

elharo pushed a commit to branch warn
in repository https://gitbox.apache.org/repos/asf/maven-scm.git

commit 743266ec740e9cf833a7fe84cf39e8c29d095eb8
Author: Elliotte Rusty Harold <el...@ibiblio.org>
AuthorDate: Thu Dec 24 10:35:55 2020 -0500

    fix wrong argument type for equals
---
 .../org/apache/maven/scm/provider/tfs/command/TfsCheckOutCommand.java   | 2 +-
 .../org/apache/maven/scm/provider/tfs/command/TfsUpdateCommand.java     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/command/TfsCheckOutCommand.java b/maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/command/TfsCheckOutCommand.java
index 7aa5e77..58e626f 100644
--- a/maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/command/TfsCheckOutCommand.java
+++ b/maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/command/TfsCheckOutCommand.java
@@ -101,7 +101,7 @@ public class TfsCheckOutCommand
         
         command.addArgument( "-force" );
         
-        if ( v != null && !v.equals( "" ) )
+        if ( v != null && !v.getName().isEmpty() )
         {
             String vType = "";
             if ( v.getType().equals( "Tag" ) )
diff --git a/maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/command/TfsUpdateCommand.java b/maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/command/TfsUpdateCommand.java
index 6fe6b09..f212902 100644
--- a/maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/command/TfsUpdateCommand.java
+++ b/maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/command/TfsUpdateCommand.java
@@ -58,7 +58,7 @@ public class TfsUpdateCommand
         String serverPath = ( (TfsScmProviderRepository) r ).getServerPath();
         TfsCommand command = new TfsCommand( "get", r, f, getLogger() );
         command.addArgument( serverPath );
-        if ( v != null && !v.equals( "" ) )
+        if ( v != null && !v.getName().isEmpty() )
         {
             String vType = "";
             if ( v.getType().equals( "Tag" ) )