v2.2.3

dherault · Mar 31, 2016 · 218403c · 218403c
1 parent aa70463
commit 218403c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "serverless-offline",
-  "version": "2.2.2",
+  "version": "2.2.3",
   "description": "Emulate AWS λ and API Gateway locally when developing your Serverless project",
   "main": "src/index.js",
   "scripts": {},

diff --git a/src/index.js b/src/index.js
@@ -296,11 +296,7 @@ module.exports = S => {
 
               /* REQUEST TEMPLATE PROCESSING (event population) */
 
-              if (!requestTemplate) {
-                console.log();
-                serverlessLog(`Warning: no template found for '${contentType}' content-type.`);
-                console.log();
-              } else {
+              if (requestTemplate) {
                 try {
                   debugLog('_____ REQUEST TEMPLATE PROCESSING _____');
                   const velocityContext = createVelocityContext(request, this.velocityContextOptions, request.payload || {});
@@ -317,7 +313,14 @@ module.exports = S => {
 
               // We create the context, its callback (context.done/succeed/fail) will send the HTTP response
               const lambdaContext = createLambdaContext(fun, (err, data) => {
+                if (this.contextWasCalled) {
+                  console.log();
+                  serverlessLog('Warning: context.done called twice!');
+                  console.log();
+                  return;
+                }
                 this.contextWasCalled = true;
+
                 debugLog('_____ HANDLER RESOLVED _____');
 
                 if (this.timeout && this.timeout._called) return;