Author: rmannibucau
Date: Fri Jan 11 13:35:03 2013
New Revision: 1432044
URL: http://svn.apache.org/viewvc?rev=1432044&view=rev
Log:
better support of 'use scanning' feature when a rest application is specified
with no beans
Modified:
openejb/trunk/openejb/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java
Modified:
openejb/trunk/openejb/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java?rev=1432044&r1=1432043&r2=1432044&view=diff
==============================================================================
---
openejb/trunk/openejb/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java
(original)
+++
openejb/trunk/openejb/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java
Fri Jan 11 13:35:03 2013
@@ -140,6 +140,7 @@ public abstract class RESTService implem
boolean deploymentWithApplication =
"true".equalsIgnoreCase(appInfo.properties.getProperty(OPENEJB_USE_APPLICATION_PROPERTY,
APPLICATION_DEPLOYMENT));
if (deploymentWithApplication) {
Application application = null;
+ boolean appSkipped = false;
String prefix = "/";
final Class<?> appClazz;
@@ -162,8 +163,8 @@ public abstract class RESTService implem
final Set<Class<?>> classes = application.getClasses();
final Set<Object> singletons = application.getSingletons();
- if (classes.size() + singletons.size() == 0) {
- application = null; // use discovered services
+ if (classes.size() + singletons.size() > 0) {
+ appSkipped = true;
} else {
for (final Class<?> clazz : classes) {
if (isProvider(clazz)) {
@@ -204,7 +205,7 @@ public abstract class RESTService implem
}
if (deploymentWithApplication) { // don't do it if we detected
we should use old deployment
- if (application == null) {
+ if (appSkipped) {
application = new InternalApplication(application);
for (final String clazz : webApp.restClass) {
