Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1034 from jclouds/fix-comparable-resourcemetadata 

fix issue #607: NPE in compareTo method of ResourceMetadataImpl
This commit is contained in:
Adrian Cole 2012-12-04 23:46:06 -08:00
parent 0a35c9b474 27dfdd571b
commit d9aaf94bd7
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/src/main/java/org/jclouds/domain/internal/ResourceMetadataImpl.java
View File

@ -20,6 +20,8 @@ package org.jclouds.domain.internal;
import static com.google.common.base.Objects.equal; import static com.google.common.base.Objects.equal;
import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.collect.ComparisonChain.start;
import static com.google.common.collect.Ordering.natural;
import java.net.URI; import java.net.URI;
import java.util.Map; import java.util.Map;
@ -62,10 +64,10 @@ public abstract class ResourceMetadataImpl<T extends Enum<T>> implements Resourc
* {@inheritDoc} * {@inheritDoc}
*/ */
@Override @Override
public int compareTo(ResourceMetadata<T> o) { public int compareTo(ResourceMetadata<T> that) {
if (getName() == null) return start()
return -1; .compare(this.getName(), that.getName(), natural().nullsLast())
return (this == o) ? 0 : getName().compareTo(o.getName()); .result();
} }
/** /**