Merge pull request #452 from rareddy/TEIID-3387

TEIID-3387
teiid · May 5, 2015 · cfbf372 · cfbf372
2 parents d498771 + 0b05b80
commit cfbf372
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/...odb/src/main/java/org/teiid/resource/adapter/mongodb/MongoDBManagedConnectionFactory.java b/...odb/src/main/java/org/teiid/resource/adapter/mongodb/MongoDBManagedConnectionFactory.java
@@ -93,20 +93,27 @@ private MongoCredential getCredential() {
 
         MongoCredential credential = null;        
         if (this.securityType.equals(SecurityType.SCRAM_SHA_1.name())) {
-            credential = MongoCredential.createScramSha1Credential(this.username, this.authDatabase, this.password.toCharArray());            
+            credential = MongoCredential.createScramSha1Credential(this.username, 
+                    (this.authDatabase == null) ? this.database: this.authDatabase, 
+                    this.password.toCharArray());            
         } 
         else if (this.securityType.equals(SecurityType.MONGODB_CR.name())) {
-            credential = MongoCredential.createMongoCRCredential(this.username, this.authDatabase, this.password.toCharArray());
+            credential = MongoCredential.createMongoCRCredential(this.username, 
+                    (this.authDatabase == null) ? this.database: this.authDatabase, 
+                    this.password.toCharArray());
         }
         else if (this.securityType.equals(SecurityType.Kerberos.name())) {
             credential = MongoCredential.createGSSAPICredential(this.username);
         }
         else if (this.securityType.equals(SecurityType.X509.name())) {
             credential = MongoCredential.createMongoX509Credential(this.username);
         }        
-        else if (MongoDBManagedConnectionFactory.this.username != null && MongoDBManagedConnectionFactory.this.password != null) {
+        else if (this.username != null && this.password != null) {
             // to support legacy pre-3.0 authentication 
-            credential = MongoCredential.createMongoCRCredential(MongoDBManagedConnectionFactory.this.username, MongoDBManagedConnectionFactory.this.database, MongoDBManagedConnectionFactory.this.password.toCharArray());
+            credential = MongoCredential.createMongoCRCredential(
+                    MongoDBManagedConnectionFactory.this.username,
+                    (this.authDatabase == null) ? this.database: this.authDatabase, 
+                    this.password.toCharArray());
         }
         return credential;
 	}