Merge pull request #381 from fkautz/pr_out_upgrading_iodine

This commit is contained in:
Frederick F. Kautz IV 2015-03-25 17:32:36 -07:00
commit db2ac35da5
2 changed files with 12 additions and 9 deletions

2
Godeps/Godeps.json generated
View File

@ -20,7 +20,7 @@
},
{
"ImportPath": "github.com/minio-io/iodine",
"Rev": "f92ca01c8671d9565c7aa58e3427364c5e187ccf"
"Rev": "2843626767a878d03d02acd4d2bc3790eb325b64"
},
{
"ImportPath": "gopkg.in/check.v1",

View File

@ -91,6 +91,7 @@ func GetGlobalStateKey(k string) string {
// New - instantiate an error, turning it into an iodine error.
// Adds an initial stack trace.
func New(err error, data map[string]string) *Error {
if err != nil {
entry := createStackEntry()
for k, v := range data {
entry.Data[k] = v
@ -101,6 +102,8 @@ func New(err error, data map[string]string) *Error {
Stack: []StackEntry{entry},
}
}
return nil
}
// createStackEntry - create stack entries
func createStackEntry() StackEntry {