1. opensymphony
  2. xwork

Commits

musachy  committed 1015024

Remove reference to commons logging and make FileManager more resilient

git-svn-id: http://svn.opensymphony.com/svn/xwork/trunk@1959e221344d-f017-0410-9bd5-d282ab1896d7

  • Participants
  • Parent commits d8bec83
  • Branches master

Comments (0)

Files changed (2)

File src/java/com/opensymphony/xwork2/CompositeTextProvider.java

View file
  • Ignore whitespace
 package com.opensymphony.xwork2;
 
 import com.opensymphony.xwork2.util.ValueStack;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.opensymphony.xwork2.util.logging.Logger;
+import com.opensymphony.xwork2.util.logging.LoggerFactory;
 
 import java.util.*;
 
  */
 public class CompositeTextProvider implements TextProvider {
 
-    private static final Log LOG = LogFactory.getLog(CompositeTextProvider.class);
+    private static final Logger LOG = LoggerFactory.getLogger(CompositeTextProvider.class);
 
     private List<TextProvider> textProviders = new ArrayList<TextProvider>();
 

File src/java/com/opensymphony/xwork2/util/FileManager.java

View file
  • Ignore whitespace
                 file = new File(fileUrl.toURI());
             } catch (URISyntaxException e) {
                 file = new File(fileUrl.getPath());
+            }  catch (Throwable t) {
+                return null;
             }
             if (file.exists() && file.canRead()) {
                 long lastModified = file.lastModified();
                 JarFile jarFile = new JarFile(jarFileName);
                 ZipEntry entry = jarFile.getEntry(fileNameInJar);
                 return new JarEntryRevision(jarFileName.toString(), fileNameInJar, entry.getTime());
-            } catch (IOException e) {
+            } catch (Throwable e) {
                 return null;
             }
         }