[JAVA-313]: several commands do not call res.throwOnError(), instead make up their own exception

Author: agirbal

src/main/com/mongodb/DB.java

@@ -215,12 +215,8 @@ public Object eval( String code , Object ... args )
         throws MongoException {
 
         CommandResult res = doEval( code , args );
-        
-        if ( res.ok() ){
-            return res.get( "retval" );
-        }
-        
-        throw new MongoException( "eval failed: " + res );
+        res.throwOnError();
+        return res.get( "retval" );
     }
 
     /**
@@ -462,8 +458,7 @@ public CommandResult authenticateCommand(String username, char[] passwd )
 
         String hash = _hash( username , passwd );
         CommandResult res = _doauth( username , hash.getBytes() );
-        if ( !res.ok())
-            throw new MongoException(res);
+        res.throwOnError();
         _username = username;
         _authhash = hash.getBytes();
         return res;
@@ -499,9 +494,7 @@ static DBObject _authCommand( String nonce , String username , byte[] hash ){
 
     private CommandResult _doauth( String username , byte[] hash ){
         CommandResult res = command(new BasicDBObject("getnonce", 1), getOptions());
-        if ( ! res.ok() ){
-            throw new MongoException(res);
-        }
+        res.throwOnError();
 
         DBObject cmd = _authCommand( res.getString( "nonce" ) , username , hash );
         return command(cmd, getOptions());

src/main/com/mongodb/DBCollection.java

@@ -767,8 +767,8 @@ public long getCount(DBObject query, DBObject fields, long limit, long skip )
                 // for now, return 0 - lets pretend it does exist
                 return 0;
             }
-            
-            throw new MongoException( "error counting : " + res );
+
+            res.throwOnError();
         }
 
         return res.getLong("n");

src/main/com/mongodb/DBPort.java

@@ -286,8 +286,7 @@ void checkAuth( DB db ) throws IOException {
 
         res = runCommand( db , temp );
 
-        if ( ! res.ok() )
-            throw new MongoException( "couldn't re-auth, username/password change?" );
+        res.throwOnError();
         _authed.put( db , true );
     }
 

src/main/com/mongodb/Mongo.java

@@ -344,10 +344,8 @@ public List<String> getDatabaseNames()
         cmd.put("listDatabases", 1);
 
 
-        BasicDBObject res = (BasicDBObject)getDB( "admin" ).command(cmd, getOptions());
-
-        if (res.getInt("ok" , 0 ) != 1 )
-            throw new MongoException( "error listing databases : " + res );
+        CommandResult res = getDB( "admin" ).command(cmd, getOptions());
+        res.throwOnError();
 
         List l = (List)res.get("databases");
 
@@ -620,4 +618,19 @@ public void run() {
             }
         }
     }
+
+    @Override
+    public String toString() {
+        String str = "Mongo: ";
+        List<ServerAddress> list = getServerAddressList();
+        if (list == null || list.isEmpty())
+            str += "null";
+        else {
+            for (ServerAddress addr : list) {
+                str += addr.toString() + ",";
+            }
+            str = str.substring(0, str.length() - 1);
+        }
+        return str;
+    }
 }

src/main/com/mongodb/ServerError.java

@@ -31,6 +31,8 @@ static int getCode( BSONObject o ){
         Object c = o.get( "code" );
         if ( c == null )
             c = o.get( "$code" );
+        if ( c == null )
+            c = o.get( "assertionCode" );
 
         if ( c == null )
             return -5;