Mercurial > hg > tomcat-userconfig
changeset 7:ca0b81d28307
Compatibility fixes.
author | Mikhail Kryshen <mikhail@kryshen.net> |
---|---|
date | Sun, 01 Nov 2009 04:25:39 +0300 |
parents | 66a0db4d54aa |
children | ff1e55a2171f |
files | src/kryshen/catalina/startup/HomesUserDatabase.java src/kryshen/catalina/startup/UserConfig.java |
diffstat | 2 files changed, 17 insertions(+), 14 deletions(-) [+] |
line diff
1.1 --- a/src/kryshen/catalina/startup/HomesUserDatabase.java Sun Nov 01 02:27:18 2009 +0300 1.2 +++ b/src/kryshen/catalina/startup/HomesUserDatabase.java Sun Nov 01 04:25:39 2009 +0300 1.3 @@ -63,7 +63,7 @@ 1.4 1.5 index++; 1.6 1.7 - if (!home.isDirectory() || !home.canExecute()) { 1.8 + if (!home.isDirectory() /* || !home.canExecute() */) { 1.9 continue; 1.10 } 1.11
2.1 --- a/src/kryshen/catalina/startup/UserConfig.java Sun Nov 01 02:27:18 2009 +0300 2.2 +++ b/src/kryshen/catalina/startup/UserConfig.java Sun Nov 01 04:25:39 2009 +0300 2.3 @@ -99,7 +99,7 @@ 2.4 protected void deployUserApps(String user, File home) { 2.5 File base = new File(home, directoryName); 2.6 2.7 - if (!base.exists() || !base.isDirectory()) { 2.8 + if (!base.exists() || !base.isDirectory() || !base.canRead()) { 2.9 return; 2.10 } 2.11 2.12 @@ -130,21 +130,24 @@ 2.13 } 2.14 2.15 File dir = new File(base, files[i]); 2.16 - if (dir.isDirectory()) { 2.17 - String contextPath; 2.18 - 2.19 - if (files[i].equals("ROOT")) { 2.20 - contextPath = "/~" + user; 2.21 - } else { 2.22 - contextPath = "/~" + user + '/' + files[i].replace('#', '/'); 2.23 - } 2.24 2.25 - if (isServiced(contextPath)) { 2.26 - continue; 2.27 - } 2.28 + if (!dir.isDirectory() || !dir.canRead()) { 2.29 + continue; 2.30 + } 2.31 2.32 - deployDirectory(contextPath, dir, dir.getAbsolutePath()); 2.33 + String contextPath; 2.34 + 2.35 + if (files[i].equals("ROOT")) { 2.36 + contextPath = "/~" + user; 2.37 + } else { 2.38 + contextPath = "/~" + user + '/' + files[i].replace('#', '/'); 2.39 } 2.40 + 2.41 + if (isServiced(contextPath)) { 2.42 + continue; 2.43 + } 2.44 + 2.45 + deployDirectory(contextPath, dir, dir.getAbsolutePath()); 2.46 } 2.47 } 2.48 }