usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject [1/6] git commit: Fixed regression bug wrt error handling in Folder and Asset
Date Wed, 05 Mar 2014 23:25:35 GMT
Repository: incubator-usergrid
Updated Branches:
  refs/heads/two-dot-o 58df930e7 -> 699d274bc
  refs/pull/69/head [created] a8ee99aa5
  refs/pull/69/merge [created] 74547da51


Fixed regression bug wrt error handling in Folder and Asset


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/a9f5e9d5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/a9f5e9d5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/a9f5e9d5

Branch: refs/pull/69/head
Commit: a9f5e9d5f6b6d64d3d56608cde31ef73900ccd2f
Parents: 631f02d
Author: ryan bridges <rbridges@apigee.com>
Authored: Wed Mar 5 17:00:35 2014 -0500
Committer: ryan bridges <rbridges@apigee.com>
Committed: Wed Mar 5 17:00:35 2014 -0500

----------------------------------------------------------------------
 sdks/html5-javascript/lib/modules/Asset.js  | 4 ++--
 sdks/html5-javascript/lib/modules/Folder.js | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a9f5e9d5/sdks/html5-javascript/lib/modules/Asset.js
----------------------------------------------------------------------
diff --git a/sdks/html5-javascript/lib/modules/Asset.js b/sdks/html5-javascript/lib/modules/Asset.js
index f40618e..c368427 100644
--- a/sdks/html5-javascript/lib/modules/Asset.js
+++ b/sdks/html5-javascript/lib/modules/Asset.js
@@ -32,11 +32,11 @@ Usergrid.Asset = function(options, callback) {
 	self._data.type = "assets";
 	var missingData = ["name", "owner", "path"].some(function(required) { return !(required
in self._data)});
 	if(missingData){
-		return doCallback(callback, [true, new Usergrid.Error("Invalid asset data: 'name', 'owner',
and 'path' are required properties.")], self);
+		return doCallback(callback, [true, new UsergridError("Invalid asset data: 'name', 'owner',
and 'path' are required properties.")], self);
 	}
 	self.save(function(err, data) {
 		if (err) {
-			doCallback(callback, [true, new Usergrid.Error(data)], self);
+			doCallback(callback, [true, new UsergridError(data)], self);
 		} else {
 			if (data && data.entities && data.entities.length){
 				self.set(data.entities[0]);

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a9f5e9d5/sdks/html5-javascript/lib/modules/Folder.js
----------------------------------------------------------------------
diff --git a/sdks/html5-javascript/lib/modules/Folder.js b/sdks/html5-javascript/lib/modules/Folder.js
index d57d4b9..ef654be 100644
--- a/sdks/html5-javascript/lib/modules/Folder.js
+++ b/sdks/html5-javascript/lib/modules/Folder.js
@@ -14,11 +14,11 @@ Usergrid.Folder = function(options, callback) {
 	self._data.type = "folders";
 	var missingData = ["name", "owner", "path"].some(function(required) { return !(required
in self._data)});
 	if(missingData){
-		return doCallback(callback, [true, new Usergrid.Error("Invalid asset data: 'name', 'owner',
and 'path' are required properties.")], self);
+		return doCallback(callback, [true, new UsergridError("Invalid asset data: 'name', 'owner',
and 'path' are required properties.")], self);
 	}
 	self.save(function(err, data) {
 		if (err) {
-			doCallback(callback, [true, new Usergrid.Error(data)], self);
+			doCallback(callback, [true, new UsergridError(data)], self);
 		} else {
 			if (data && data.entities && data.entities.length){
 				self.set(data.entities[0]);


Mime
View raw message