Skip to content

Commit

Permalink
(fix) $preRoute merge issue
Browse files Browse the repository at this point in the history
  • Loading branch information
jstty committed Oct 4, 2016
1 parent bd2b993 commit a35b5df
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 17 deletions.
9 changes: 1 addition & 8 deletions legacy/service.middleware/apiviewRoutes.js
Original file line number Diff line number Diff line change
Expand Up @@ -314,14 +314,7 @@ var ApiViewRoutes = function (_ServiceMiddleware) {

var deferer = when.defer();
var resolveOutput = function resolveOutput(newOutput) {
// needed to add this customer to work around the issue of lodash converting buffers to arrays
// https://github.com/lodash/lodash/issues/1453
var out = _.merge(orgOutput, newOutput, function (a, b) {
if (b instanceof Buffer) {
return b;
}
});
deferer.resolve(out);
deferer.resolve(newOutput);
};

// TODO: dependency injection
Expand Down
9 changes: 1 addition & 8 deletions lib/service.middleware/apiviewRoutes.js
Original file line number Diff line number Diff line change
Expand Up @@ -286,14 +286,7 @@ class ApiViewRoutes extends ServiceMiddleware {

var deferer = when.defer();
var resolveOutput = function (newOutput) {
// needed to add this customer to work around the issue of lodash converting buffers to arrays
// https://github.com/lodash/lodash/issues/1453
var out = _.merge(orgOutput, newOutput, function (a, b) {
if (b instanceof Buffer) {
return b;
}
});
deferer.resolve(out);
deferer.resolve(newOutput);
};

// TODO: dependency injection
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "hyper.io",
"version": "0.6.4",
"version": "0.6.5",
"description": "MicroServices so fast they've gone plaid!",
"homepage": "https://github.com/jstty/hyper.io#readme",
"keywords": [
Expand Down

0 comments on commit a35b5df

Please sign in to comment.