You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by st...@apache.org on 2014/01/06 12:25:25 UTC
[12/21] git commit: Prevent potential NPE and provide a faster path
via identity check
Prevent potential NPE and provide a faster path via identity check
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/d728b021
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/d728b021
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/d728b021
Branch: refs/heads/master
Commit: d728b0218f5eb9516282284e4ad53d5ac82ca21a
Parents: 7267996
Author: Stephen Connolly <st...@gmail.com>
Authored: Mon Jan 6 10:51:04 2014 +0000
Committer: Stephen Connolly <st...@gmail.com>
Committed: Mon Jan 6 10:51:04 2014 +0000
----------------------------------------------------------------------
.../org/apache/maven/plugin/descriptor/MojoDescriptor.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/d728b021/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/MojoDescriptor.java
----------------------------------------------------------------------
diff --git a/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/MojoDescriptor.java b/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/MojoDescriptor.java
index f084b13..7ebb04a 100644
--- a/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/MojoDescriptor.java
+++ b/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/MojoDescriptor.java
@@ -554,7 +554,12 @@ public class MojoDescriptor
private boolean compareObjects( Object first, Object second )
{
- if ( ( first == null && second != null ) || ( first != null && second == null ) )
+ if ( first == second )
+ {
+ return true;
+ }
+
+ if ( first == null || second == null )
{
return false;
}