fix failure-callback on service-discovery

neo-technology · Jan 23, 2012 · 5245de1 · 5245de1
1 parent 11901f3
commit 5245de1
Showing 1 changed file with 4 additions and 12 deletions.
diff --git a/src/main/javascript/neo4j/GraphDatabase.js b/src/main/javascript/neo4j/GraphDatabase.js
@@ -290,11 +290,8 @@ _.extend(neo4j.GraphDatabase.prototype,
         if (typeof (this._serviceDefinitionPromise) === "undefined")
         {
             var db = this;
-            this._serviceDefinitionPromise = this.getDiscoveryDocument().then(function( discovery, fulfill, fail ) {
+            this._serviceDefinitionPromise = this.getDiscoveryDocument().then(function (discovery, fulfill, fail) {
-                db.web.get( discovery.data , function(resources)
+                db.web.get(discovery.data, fulfill, fail);
-                {
-                    fulfill(resources);
-                });
             });
         }
 
@@ -305,13 +302,8 @@ _.extend(neo4j.GraphDatabase.prototype,
         if (typeof (this._discoveryDocumentPromise) === "undefined")
         {
             var db = this;
-            this._discoveryDocumentPromise = new neo4j.Promise(function(
+            this._discoveryDocumentPromise = new neo4j.Promise(function (fulfill, fail) {
-                    fulfill, fail)
+                db.web.get(db.url, fulfill, fail);
-            {
-                db.web.get(db.url, function(resources)
-                {
-                    fulfill(resources);
-                });
             });
         }