Fix remoteNodeProvider: empty response could end up in the node stayi…

…ng in _loading mode.
pydio · Jul 17, 2015 · e6d1da1 · e6d1da1
1 parent deecb10
commit e6d1da1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/core/src/plugins/gui.ajax/res/js/core/model/RemoteNodeProvider.js b/core/src/plugins/gui.ajax/res/js/core/model/RemoteNodeProvider.js
@@ -180,12 +180,12 @@ var RemoteNodeProvider = (function () {
 
     RemoteNodeProvider.prototype.parseNodes = function parseNodes(origNode, transport, nodeCallback, childCallback, childrenOnly) {
         if (!transport.responseXML || !transport.responseXML.documentElement) {
+            Logger.debug('Loading node ' + origNode.getPath() + ' has wrong response: ' + transport.responseText);
+            if (nodeCallback) nodeCallback(origNode);
+            origNode.setLoaded(false);
             if (!transport.responseText) {
                 throw new Error('Empty response!');
             }
-            Logger.debug(transport.responseText);
-            if (nodeCallback) nodeCallback(origNode);
-            origNode.setLoaded(false);
             throw new Error('Invalid XML Document (see console)');
         }
         var rootNode = transport.responseXML.documentElement;

diff --git a/core/src/plugins/gui.ajax/res/js/es6/model/RemoteNodeProvider.es6 b/core/src/plugins/gui.ajax/res/js/es6/model/RemoteNodeProvider.es6
@@ -165,12 +165,12 @@ class RemoteNodeProvider{
      */
     parseNodes (origNode, transport, nodeCallback, childCallback, childrenOnly){
         if(!transport.responseXML || !transport.responseXML.documentElement) {
+            Logger.debug('Loading node ' + origNode.getPath() + ' has wrong response: ' + transport.responseText);
+            if(nodeCallback) nodeCallback(origNode);
+            origNode.setLoaded(false);
             if(!transport.responseText){
                 throw new Error('Empty response!');
             }
-            Logger.debug(transport.responseText);
-            if(nodeCallback) nodeCallback(origNode);
-            origNode.setLoaded(false);
             throw new Error('Invalid XML Document (see console)');
         }
         var rootNode = transport.responseXML.documentElement;