[patch] patch containing fix for pathnameOld

completePatch (text/plain), 4.77 KB, created by Xavier Poinsard on 2004-01-14 16:44:20 UTC

(hide)

Description: patch containing fix for pathnameOld

Filename:

MIME Type:

Creator: Xavier Poinsard

Created: 2004-01-14 16:44:20 UTC

Size: 4.77 KB

patch

obsolete

>Index: MemoryGroup.java >=================================================================== >RCS file: /home/cvspublic/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/users/MemoryGroup.java,v >retrieving revision 1.2 >diff -u -r1.2 MemoryGroup.java >--- MemoryGroup.java 2 Sep 2003 21:22:03 -0000 1.2 >+++ MemoryGroup.java 14 Jan 2004 16:40:04 -0000 >@@ -178,6 +178,7 @@ > roles.add(role); > } > } >+ this.database.setModified(); > > } > >@@ -206,6 +207,7 @@ > synchronized (roles) { > roles.remove(role); > } >+ this.database.setModified(); > > } > >@@ -218,6 +220,7 @@ > synchronized (roles) { > roles.clear(); > } >+ this.database.setModified(); > > } > >@@ -255,5 +258,21 @@ > > } > >+ >+ /** >+ * @see org.apache.catalina.Group#setDescription(java.lang.String) >+ */ >+ public void setDescription(String description) { >+ super.setDescription(description); >+ this.database.setModified(); >+ } >+ >+ /** >+ * @see org.apache.catalina.Group#setGroupname(java.lang.String) >+ */ >+ public void setGroupname(String groupname) { >+ super.setGroupname(groupname); >+ this.database.setModified(); >+ } > > } >Index: MemoryRole.java >=================================================================== >RCS file: /home/cvspublic/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/users/MemoryRole.java,v >retrieving revision 1.2 >diff -u -r1.2 MemoryRole.java >--- MemoryRole.java 2 Sep 2003 21:22:03 -0000 1.2 >+++ MemoryRole.java 14 Jan 2004 16:40:04 -0000 >@@ -145,4 +145,20 @@ > } > > >+ /** >+ * @see org.apache.catalina.Role#setDescription(java.lang.String) >+ */ >+ public void setDescription(String description) { >+ super.setDescription(description); >+ this.database.setModified(); >+ } >+ >+ /** >+ * @see org.apache.catalina.Role#setRolename(java.lang.String) >+ */ >+ public void setRolename(String rolename) { >+ super.setRolename(rolename); >+ this.database.setModified(); >+ } >+ > } >Index: MemoryUser.java >=================================================================== >RCS file: /home/cvspublic/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/users/MemoryUser.java,v >retrieving revision 1.3 >diff -u -r1.3 MemoryUser.java >--- MemoryUser.java 5 Sep 2003 04:20:49 -0000 1.3 >+++ MemoryUser.java 14 Jan 2004 16:40:05 -0000 >@@ -181,6 +181,7 @@ > groups.add(group); > } > } >+ this.database.setModified(); > > } > >@@ -197,6 +198,7 @@ > roles.add(role); > } > } >+ this.database.setModified(); > > } > >@@ -241,6 +243,7 @@ > synchronized (groups) { > groups.remove(group); > } >+ this.database.setModified(); > > } > >@@ -253,6 +256,7 @@ > synchronized (groups) { > groups.clear(); > } >+ this.database.setModified(); > > } > >@@ -267,6 +271,7 @@ > synchronized (roles) { > roles.remove(role); > } >+ this.database.setModified(); > > } > >@@ -279,6 +284,7 @@ > synchronized (roles) { > roles.clear(); > } >+ this.database.setModified(); > > } > >@@ -338,5 +344,29 @@ > > } > >+ >+ /** >+ * @see org.apache.catalina.User#setFullName(java.lang.String) >+ */ >+ public void setFullName(String fullName) { >+ super.setFullName(fullName); >+ this.database.setModified(); >+ } >+ >+ /** >+ * @see org.apache.catalina.User#setPassword(java.lang.String) >+ */ >+ public void setPassword(String password) { >+ super.setPassword(password); >+ this.database.setModified(); >+ } >+ >+ /** >+ * @see org.apache.catalina.User#setUsername(java.lang.String) >+ */ >+ public void setUsername(String username) { >+ super.setUsername(username); >+ this.database.setModified(); >+ } > > } >Index: MemoryUserDatabase.java >=================================================================== >RCS file: /home/cvspublic/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/users/MemoryUserDatabase.java,v >retrieving revision 1.3 >diff -u -r1.3 MemoryUserDatabase.java >--- MemoryUserDatabase.java 5 Jan 2004 15:04:14 -0000 1.3 >+++ MemoryUserDatabase.java 14 Jan 2004 16:40:07 -0000 >@@ -218,7 +218,13 @@ > return (this.pathname); > > } >- >+ /** >+ * set the modifed flag >+ * >+ */ >+ public void setModified(){ >+ modified = true; >+ } > > /** > * Set the relative or absolute pathname to the persistent storage file. >@@ -570,7 +576,7 @@ > } > > // Perform the required renames to permanently save this file >- File fileOld = new File(pathnameNew); >+ File fileOld = new File(pathnameOld); > if (!fileOld.isAbsolute()) { > fileOld = > new File(System.getProperty("catalina.base"), pathnameOld); View Attachment As Diff View Attachment As Raw

This is ASF Bugzilla: the Apache Software Foundation bug system. In case of problems with the functioning of ASF Bugzilla, please contact bugzilla-admin@apache.org. Please Note: this e-mail address is only for reporting problems with ASF Bugzilla. Mail about any other subject will be silently ignored.

• • Home
  • | New
  • | Browse
  • | Search
  • |
    [?]
  • | Reports
  • | Help
  • | New Account
  • | Log In
    Remember [x]
  • | Forgot Password
    Login: [x]