Merge pull request #86 from lwander/npe-app-save

Matt Duftler · Matt Duftler · commit 0a9bc1c5b5c7 · 2016-05-10T16:00:58.000-04:00
core: NPE thrown while reporting save error
diff --git a/front50-core/src/main/groovy/com/netflix/spinnaker/front50/model/application/Application.groovy b/front50-core/src/main/groovy/com/netflix/spinnaker/front50/model/application/Application.groovy
@@ -275,7 +275,7 @@ class Application implements Timestamped {
         log.error("Rollback failed (onRollback)", rollbackException)
       }
 
-      log.error("Failed to perform action (name: ${originalApplication.name ?: updatedApplication.name})")
+      log.error("Failed to perform action (name: ${originalApplication?.name ?: updatedApplication?.name})")
       throw e
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -275,7 +275,7 @@ class Application implements Timestamped {`
`275`	`275`	`log.error("Rollback failed (onRollback)", rollbackException)`
`276`	`276`	`}`
`277`	`277`
`278`		`- log.error("Failed to perform action (name: ${originalApplication.name ?: updatedApplication.name})")`
	`278`	`+ log.error("Failed to perform action (name: ${originalApplication?.name ?: updatedApplication?.name})")`
`279`	`279`	`throw e`
`280`	`280`	`}`
`281`	`281`	`}`