Skip to content

Commit 3c73ebf

Browse files
committed
Merging master.
2 parents 988823c + 2cff52b commit 3c73ebf

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
<groupId>com.e-gineering</groupId>
1010
<artifactId>gitflow-helper-maven-plugin</artifactId>
1111
<version>1.8.0-SNAPSHOT</version>
12+
1213
<packaging>maven-plugin</packaging>
1314

1415
<name>gitflow-helper-maven-plugin</name>

src/main/java/com/e_gineering/maven/gitflowhelper/ScmUtils.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,11 @@ public static String resolveUrlOrExpression(final MavenProject project, final Lo
3535
if (StringUtils.isBlank(connectionUrl)) {
3636
connectionUrl = project.getScm().getConnection();
3737
}
38-
return connectionUrl;
38+
39+
// Issue #74, missing an emtpy / null check before returning.
40+
if (!StringUtils.isBlank(connectionUrl)) {
41+
return connectionUrl;
42+
}
3943
}
4044

4145
return DEFAULT_URL_EXPRESSION;

0 commit comments

Comments
 (0)