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 2016/09/07 08:50:18 UTC
tomee git commit: TOMEE-1923 using canonical files to ensure we
compare the same things
Repository: tomee
Updated Branches:
refs/heads/master f91f2833e -> 3375c201e
TOMEE-1923 using canonical files to ensure we compare the same things
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/3375c201
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/3375c201
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/3375c201
Branch: refs/heads/master
Commit: 3375c201e6c15fcfb8c7031254e0d05b4ed61ff5
Parents: f91f283
Author: Romain manni-Bucau <rm...@gmail.com>
Authored: Wed Sep 7 10:50:09 2016 +0200
Committer: Romain manni-Bucau <rm...@gmail.com>
Committed: Wed Sep 7 10:50:09 2016 +0200
----------------------------------------------------------------------
.../org/apache/catalina/startup/OpenEJBContextConfig.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/3375c201/tomee/tomee-catalina/src/main/java/org/apache/catalina/startup/OpenEJBContextConfig.java
----------------------------------------------------------------------
diff --git a/tomee/tomee-catalina/src/main/java/org/apache/catalina/startup/OpenEJBContextConfig.java b/tomee/tomee-catalina/src/main/java/org/apache/catalina/startup/OpenEJBContextConfig.java
index 1dcbbd2..da82715 100644
--- a/tomee/tomee-catalina/src/main/java/org/apache/catalina/startup/OpenEJBContextConfig.java
+++ b/tomee/tomee-catalina/src/main/java/org/apache/catalina/startup/OpenEJBContextConfig.java
@@ -717,7 +717,12 @@ public class OpenEJBContextConfig extends ContextConfig {
file = toFile;
}
- File current = classAsFile;
+ File current;
+ try { // symb links and windows long home names
+ current = classAsFile.getCanonicalFile();
+ } catch (final IOException e) {
+ current = classAsFile;
+ }
while (current != null && current.exists()) {
if (current.equals(file)) {
final File parent = current.getParentFile();