| commit | 90624cc19eaf039ec12abfd6cb403dec6af76a4a | [log] [tgz] |
|---|---|---|
| author | Romain Manni-Bucau <rmannibucau@apache.org> | Fri Jan 11 14:10:36 2013 +0000 |
| committer | Romain Manni-Bucau <rmannibucau@apache.org> | Fri Jan 11 14:10:36 2013 +0000 |
| tree | e4adec9c82e44442dad62160241281819bfabc0c | |
| parent | c295e187a8a829fe714ee8bce6f665cdcdc6bed7 [diff] |
NPE protection git-svn-id: https://svn.apache.org/repos/asf/openejb/trunk@1432057 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/openejb/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java b/openejb/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java index 3a17929..762ad12 100644 --- a/openejb/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java +++ b/openejb/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java
@@ -205,7 +205,7 @@ } if (deploymentWithApplication) { // don't do it if we detected we should use old deployment - if (appSkipped) { + if (appSkipped || application == null) { application = new InternalApplication(application); for (final String clazz : webApp.restClass) {