Merge branch 'release/1.1.5'

catberry · Jun 7, 2015 · d8a7844 · d8a7844
2 parents da431ad + 2b9854c
commit d8a7844
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/lib/ServiceLocator.js b/lib/ServiceLocator.js
@@ -45,7 +45,7 @@ var DEPENDENCY_REGEXP = /^\$\w+/,
  * @constructor
  */
 function ServiceLocator() {
-	this._registrations = {};
+	this._registrations = Object.create(null);
 }
 
 /**
@@ -162,7 +162,7 @@ ServiceLocator.prototype.unregister = function (type) {
  * @param {ServiceLocator} context Context of execution.
  */
 function initializeRegistration(type, context) {
-	if (!context._registrations.hasOwnProperty(type)) {
+	if (!(type in context._registrations)) {
 		context._registrations[type] = [];
 	}
 }
@@ -173,8 +173,7 @@ function initializeRegistration(type, context) {
  * @param {string} type Type to check.
  */
 function throwIfNoType(registrations, type) {
-	if (!registrations.hasOwnProperty(type) ||
-		registrations[type].length === 0) {
+	if (!(type in registrations) || registrations[type].length === 0) {
 		throw new Error(util.format(ERROR_TYPE_NOT_REGISTERED, type));
 	}
 }

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "catberry-locator",
-	"version": "1.1.4",
+	"version": "1.1.5",
 	"author": "Denis Rechkunov <[email protected]>",
 	"description": "Service Locator component for Catberry Framework",
 	"homepage": "https://github.com/catberry/catberry-locator",