Author: markt
Date: Fri Sep 21 08:15:53 2018
New Revision: 1841553
URL: http://svn.apache.org/viewvc?rev=1841553&view=rev
Log:
Review of fix for BZ 58590 from schultz.
Protect against parsing failures
Modified:
tomcat/trunk/java/org/apache/catalina/users/MemoryUserDatabase.java
Modified: tomcat/trunk/java/org/apache/catalina/users/MemoryUserDatabase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/users/MemoryUserDatabase.java?rev=1841553&r1=1841552&r2=1841553&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/users/MemoryUserDatabase.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/users/MemoryUserDatabase.java Fri Sep
21 08:15:53 2018
@@ -451,6 +451,13 @@ public class MemoryUserDatabase implemen
} catch (IOException ioe) {
log.error(sm.getString("memoryUserDatabase.fileNotFound",
pathName));
}
+ } catch (Exception e) {
+ // Fail safe on error
+ users.clear();
+ groups.clear();
+ roles.clear();
+
+ throw e;
} finally {
writeLock.unlock();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
