Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge pull request #65 from dead-horse/try-catch

fix try catch bug in get & update test
  • Loading branch information...
commit 806b0ef615915a38fadbe394264823b028720d72 2 parents 0c6155d + 3bb605c
@tj authored
Showing with 16 additions and 9 deletions.
  1. +8 −6 lib/connect-redis.js
  2. +8 −3 test.js
View
14 lib/connect-redis.js
@@ -91,14 +91,16 @@ module.exports = function(connect){
debug('GET "%s"', sid);
this.client.get(sid, function(err, data){
if (err) return fn(err);
+ if (!data) return fn();
+ var result;
+ data = data.toString();
+ debug('GOT %s', data);
try {
- if (!data) return fn();
- data = data.toString();
- debug('GOT %s', data);
- fn(null, JSON.parse(data));
+ result = JSON.parse(data);
} catch (err) {
- fn(err);
- }
+ return fn(err);
+ }
+ return fn(null, result);
});
};
View
11 test.js
@@ -15,12 +15,12 @@ store.client.on('connect', function(){
store.set('123', { cookie: { maxAge: 2000 }, name: 'tj' }, function(err, ok){
assert.ok(!err, '#set() got an error');
assert.ok(ok, '#set() is not ok');
-
+
// #get()
store.get('123', function(err, data){
assert.ok(!err, '#get() got an error');
assert.deepEqual({ cookie: { maxAge: 2000 }, name: 'tj' }, data);
-
+
// #set null
store.set('123', { cookie: { maxAge: 2000 }, name: 'tj' }, function(){
store.destroy('123', function(){
@@ -29,6 +29,11 @@ store.client.on('connect', function(){
store_alt.client.end();
});
});
- })
+ throw new Error('Error in fn');
+ });
});
});
+
+process.once('uncaughtException', function (err) {
+ assert.ok(err.message === 'Error in fn', '#get() catch wrong error');
+});

0 comments on commit 806b0ef

Please sign in to comment.
Something went wrong with that request. Please try again.