Browse Source

Merge branch 'candidate-5.6.2' into candidate-6.0.0

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Richard Chapman 9 years ago
parent
commit
9c78c402b1
2 changed files with 2 additions and 2 deletions
  1. 2 1
      common/remote/hooks/git/gitfile.cpp
  2. 0 1
      roxie/ccd/ccdstate.cpp

+ 2 - 1
common/remote/hooks/git/gitfile.cpp

@@ -93,7 +93,8 @@ public:
                 if (sizeRead < chunkSize)
                 {
                     buf.setLength(buf.length() - (chunkSize - sizeRead));
-                    break;
+                    if (!sizeRead)
+                        break;
                 }
             }
             pipe->closeOutput();

+ 0 - 1
roxie/ccd/ccdstate.cpp

@@ -620,7 +620,6 @@ protected:
                         if (resolved)
                         {
                             files.append(*const_cast<IResolvedFile *>(resolved));
-                            doPreload(0, resolved);
                             Owned<IPropertyTreeIterator> it = ccdChannels->getElements("RoxieSlaveProcess");
                             ForEach(*it)
                             {