Skip to content

Commit dec0cab

Browse files
JAVA-434: replaced isEmpty() with 1.5 compatible alternative
1 parent e177d74 commit dec0cab

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

src/main/com/mongodb/DBCollection.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -485,7 +485,7 @@ public void ensureIndex( DBObject keys , String name )
485485
public void ensureIndex( DBObject keys , String name , boolean unique )
486486
throws MongoException {
487487
DBObject options = defaultOptions( keys );
488-
if (name != null && !name.isEmpty())
488+
if (name != null && name.length()>0)
489489
options.put( "name" , name );
490490
if ( unique )
491491
options.put( "unique" , Boolean.TRUE );

src/main/com/mongodb/Mongo.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -718,7 +718,7 @@ public void run() {
718718
public String toString() {
719719
StringBuilder str = new StringBuilder("Mongo: ");
720720
List<ServerAddress> list = getServerAddressList();
721-
if (list == null || list.isEmpty())
721+
if (list == null || list.size() == 0)
722722
str.append("null");
723723
else {
724724
for ( ServerAddress addr : list )

src/main/com/mongodb/MongoURI.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616

1717
package com.mongodb;
1818

19-
import java.util.List;
20-
import java.util.LinkedList;
19+
import java.net.UnknownHostException;
2120
import java.util.Collections;
21+
import java.util.LinkedList;
22+
import java.util.List;
2223
import java.util.logging.Logger;
23-
import java.net.UnknownHostException;
2424

2525
/**
2626
* Represents a <a href="http://www.mongodb.org/display/DOCS/Connections">URI</a>
@@ -160,7 +160,7 @@ else if ( key.equals( "waitqueuemultiple" ) )
160160

161161
boolean _parseBoolean( String _in ){
162162
String in = _in.trim();
163-
if ( in != null && !in.isEmpty() && ( in.equals( "1" ) || in.toLowerCase().equals( "true" ) || in.toLowerCase()
163+
if ( in != null && in.length() > 0 && ( in.equals( "1" ) || in.toLowerCase().equals( "true" ) || in.toLowerCase()
164164
.equals( "yes" ) ) )
165165
return true;
166166
else return false;

src/main/com/mongodb/ReplicaSetStatus.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@ public String toJSON(){
346346
buf.append( "isMaster:" ).append( _isMaster ).append( ", " );
347347
buf.append( "isSecondary:" ).append( _isSecondary ).append( ", " );
348348
buf.append( "priority:" ).append( _priority ).append( ", " );
349-
if(_tags != null && !_tags.isEmpty())
349+
if(_tags != null && _tags.size() > 0)
350350
buf.append( "tags:" ).append( JSON.serialize( _tags ) );
351351
buf.append("}");
352352

@@ -438,7 +438,7 @@ synchronized void updateAll(){
438438
n.update(seenNodes);
439439
}
440440

441-
if (!seenNodes.isEmpty()) {
441+
if (seenNodes.size() > 0) {
442442
// not empty, means that at least 1 server gave node list
443443
// remove unused hosts
444444
Iterator<Node> it = _all.iterator();

0 commit comments

Comments
 (0)