Change error handling of timers to be more error tolerant. (#946)

IoT.js-DCO-1.0-Signed-off-by: László Langó [email protected]

Author: LaszloLango

src/js/timers.js

@@ -94,10 +94,12 @@ exports.setTimeout = timeoutConfigurator.bind(undefined, false);
 exports.setInterval = timeoutConfigurator.bind(undefined, true);
 
 function clearTimeoutBase(timeoutType, timeout) {
-  if (timeout && (timeout instanceof Timeout)) {
-    timeout.unref();
-  } else {
-    throw new Error(timeoutType + '() - invalid timeout');
+  if (timeout) {
+    if (timeout instanceof Timeout) {
+      timeout.unref();
+    } else {
+       throw new Error(timeoutType + '() - invalid timeout');
+    }
   }
 }
 

test/node/parallel/test-timers-clear-null-does-not-throw-error.js

@@ -0,0 +1,54 @@
+/* Copyright 2017-present Samsung Electronics Co., Ltd. and other contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// Copyright Joyent, Inc. and other Node contributors.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to permit
+// persons to whom the Software is furnished to do so, subject to the
+// following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+// USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+'use strict';
+require('node/common');
+var assert = require('assert');
+
+// This test makes sure clearing timers with
+// 'null' or no input does not throw error
+
+assert.doesNotThrow(function() { clearInterval(null) });
+
+assert.doesNotThrow(function() { clearInterval() });
+
+assert.doesNotThrow(function() { clearTimeout(null) });
+
+assert.doesNotThrow(function() { clearTimeout() });
+
+// assert.doesNotThrow(function() { clearImmediate(null) });
+
+// assert.doesNotThrow(function() { clearImmediate() });

test/run_pass/test_timers_error.js

@@ -47,14 +47,9 @@ assert.throws(function() {
 }, TypeError);
 
 // ClearTimeout without timeout parameter.
-assert.throws(function() {
+assert.doesNotThrow(function() {
   clearTimeout();
-}, Error);
-
-// ClearTimeout with invalid timeout parameter.
-assert.throws(function() {
-  clearTimeout(timeout);
-}, Error);
+});
 
 assert.throws(function() {
   clearTimeout('timeout');
@@ -64,13 +59,13 @@ assert.throws(function() {
   clearTimeout(1000);
 }, Error);
 
-assert.throws(function() {
+assert.doesNotThrow(function() {
   clearTimeout(null);
-}, Error);
+});
 
-assert.throws(function() {
+assert.doesNotThrow(function() {
   clearTimeout(undefined);
-}, Error);
+});
 
 assert.throws(function() {
   clearTimeout({timeout: 1000});
@@ -107,22 +102,18 @@ assert.throws(function() {
 }, TypeError);
 
 // ClearInterval without interval parameter.
-assert.throws(function() {
+assert.doesNotThrow(function() {
   clearInterval();
-}, Error);
+});
 
 // ClearInterval with invalid interval parameter.
-assert.throws(function() {
+assert.doesNotThrow(function() {
   clearInterval(null);
-}, Error);
+});
 
-assert.throws(function() {
+assert.doesNotThrow(function() {
   clearInterval(undefined);
-}, Error);
-
-assert.throws(function() {
-  clearInterval(interval);
-}, Error);
+});
 
 assert.throws(function() {
   clearInterval('interval');

test/testsets.json

@@ -117,6 +117,7 @@
     { "name": "test-http-write-head.js" },
     { "name": "test-net-bind-twice.js" },
     { "name": "test-net-end-without-connect.js" },
-    { "name": "test-net-keepalive.js"}
+    { "name": "test-net-keepalive.js" },
+    { "name": "test-timers-clear-null-does-not-throw-error.js" }
   ]
 }