You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mk...@apache.org on 2008/03/10 22:08:00 UTC
svn commit: r635690 - in /maven/components:
branches/maven-2.0.x/maven-toolchain/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java
trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java
Author: mkleint
Date: Mon Mar 10 14:07:54 2008
New Revision: 635690
URL: http://svn.apache.org/viewvc?rev=635690&view=rev
Log:
MAVEN-3430 make sure getType never returns null.
Modified:
maven/components/branches/maven-2.0.x/maven-toolchain/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java
maven/components/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java
Modified: maven/components/branches/maven-2.0.x/maven-toolchain/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-toolchain/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java?rev=635690&r1=635689&r2=635690&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-toolchain/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java (original)
+++ maven/components/branches/maven-2.0.x/maven-toolchain/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java Mon Mar 10 14:07:54 2008
@@ -58,7 +58,7 @@
public final String getType( )
{
- return type;
+ return type != null ? type : model.getType();
}
Modified: maven/components/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java?rev=635690&r1=635689&r2=635690&view=diff
==============================================================================
--- maven/components/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java (original)
+++ maven/components/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java Mon Mar 10 14:07:54 2008
@@ -58,7 +58,7 @@
public final String getType( )
{
- return type;
+ return type != null ? type : model.getType();
}