You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2012/12/04 21:30:28 UTC
svn commit: r1417157 -
/openejb/trunk/openejb/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java
Author: rmannibucau
Date: Tue Dec 4 20:30:27 2012
New Revision: 1417157
URL: http://svn.apache.org/viewvc?rev=1417157&view=rev
Log:
regression from yesterday, see ScannedApplication
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=1417157&r1=1417156&r2=1417157&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 Tue Dec 4 20:30:27 2012
@@ -220,7 +220,9 @@ public abstract class RESTService implem
}
if (!useApp) {
- appPrefix = webApp.contextRoot;
+ if (webApp.restApplications.isEmpty() || webApp.restApplications.size() > 1) {
+ appPrefix = webApp.contextRoot;
+ } // else keep application prefix
final Set<String> restClasses = new HashSet<String>(webApp.restClass);
restClasses.addAll(webApp.ejbRestServices);