remm 2004/01/05 08:33:38
Modified: catalina/src/share/org/apache/catalina/users
MemoryUserDatabase.java
Log:
- Revert patch.
- Bug 25822 will not be addressed, since it cannot be resolved without adding
significant complexity.
Revision Changes Path
1.4 +0 -18
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/users/MemoryUserDatabase.java
Index: MemoryUserDatabase.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/users/MemoryUserDatabase.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MemoryUserDatabase.java 5 Jan 2004 15:04:14 -0000 1.3
+++ MemoryUserDatabase.java 5 Jan 2004 16:33:37 -0000 1.4
@@ -138,12 +138,6 @@
/**
- * Was the database modified ?
- */
- private boolean modified = false;
-
-
- /**
* The relative (to <code>catalina.base</code>) or absolute pathname to
* the XML file in which we will save our persistent information.
*/
@@ -293,7 +287,6 @@
synchronized (groups) {
groups.put(group.getGroupname(), group);
}
- modified = true;
return (group);
}
@@ -311,7 +304,6 @@
synchronized (roles) {
roles.put(role.getRolename(), role);
}
- modified = true;
return (role);
}
@@ -331,7 +323,6 @@
synchronized (users) {
users.put(user.getUsername(), user);
}
- modified = true;
return (user);
}
@@ -435,7 +426,6 @@
}
}
- modified = false;
}
@@ -455,7 +445,6 @@
}
groups.remove(group.getGroupname());
}
- modified = true;
}
@@ -480,7 +469,6 @@
}
roles.remove(role.getRolename());
}
- modified = true;
}
@@ -495,7 +483,6 @@
synchronized (users) {
users.remove(user.getUsername());
}
- modified = true;
}
@@ -507,11 +494,6 @@
* @exception Exception if any exception is thrown during saving
*/
public void save() throws Exception {
-
- if (!modified) {
- return;
- }
- modified = false;
// Write out contents to a temporary file
File fileNew = new File(pathnameNew);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
