Author: rmannibucau
Date: Wed Oct 1 16:58:33 2014
New Revision: 1628774
URL: http://svn.apache.org/r1628774
Log:
TOMEE-1370 supporting sym links for @WebXXX scanning
Modified:
tomee/tomee/branches/tomee-1.7.x/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java
Modified:
tomee/tomee/branches/tomee-1.7.x/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java?rev=1628774&r1=1628773&r2=1628774&view=diff
==============================================================================
---
tomee/tomee/branches/tomee-1.7.x/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java
(original)
+++
tomee/tomee/branches/tomee-1.7.x/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java
Wed Oct 1 16:58:33 2014
@@ -634,7 +634,13 @@ public class OpenEJBContextConfig extend
}
private boolean isIncludedIn(final String filePath, final File
classAsFile) throws MalformedURLException {
- final File file = URLs.toFile(new URL(filePath));
+ final File toFile = URLs.toFile(new URL(filePath));
+ File file;
+ try { // symb links
+ file = toFile.getCanonicalFile();
+ } catch (final IOException e) {
+ file = toFile;
+ }
File current = classAsFile;
while (current != null && current.exists()) {
