Attachment #9948 for bug #25822

View | Details | Raw Unified | Return to bug 25822
Collapse All | Expand All




                roles.add(role);
            }
        }
        this.database.setModified();

    }


        synchronized (roles) {
            roles.remove(role);
        }
		this.database.setModified();

    }


        synchronized (roles) {
            roles.clear();
        }
		this.database.setModified();

    }



    }


    /**
     * @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();
    }

}




    }


    /**
     * @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();
    }

}




                groups.add(group);
            }
        }
		this.database.setModified();

    }


                roles.add(role);
            }
        }
		this.database.setModified();

    }


        synchronized (groups) {
            groups.remove(group);
        }
		this.database.setModified();

    }


        synchronized (groups) {
            groups.clear();
        }
		this.database.setModified();

    }


        synchronized (roles) {
            roles.remove(role);
        }
		this.database.setModified();

    }


        synchronized (roles) {
            roles.clear();
        }
		this.database.setModified();

    }



    }


    /**
     * @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();
    }

}

Lines 218-224 Link Here

(-)MemoryUserDatabase.java (-2 / +8 lines)
218	return (this.pathname);	218	return (this.pathname);
219		219
220	}	220	}
221		221	/**
		222	* set the modifed flag
		223	*
		224	*/
		225	public void setModified(){
		226	modified = true;
		227	}
222		228
223	/**	229	/**
224	* Set the relative or absolute pathname to the persistent storage file.	230	* Set the relative or absolute pathname to the persistent storage file.
Lines 570-576 Link Here
570	}	576	}
571		577
572	// Perform the required renames to permanently save this file	578	// Perform the required renames to permanently save this file
573	File fileOld = new File(pathnameNew);	579	File fileOld = new File(pathnameOld);
574	if (!fileOld.isAbsolute()) {	580	if (!fileOld.isAbsolute()) {
575	fileOld =	581	fileOld =
576	new File(System.getProperty("catalina.base"), pathnameOld);	582	new File(System.getProperty("catalina.base"), pathnameOld);

Return to bug 25822

Lines 178-183 Link Here

(-)MemoryGroup.java (+19 lines)
178	roles.add(role);	178	roles.add(role);
179	}	179	}
180	}	180	}
		181	this.database.setModified();
181		182
182	}	183	}
183		184
Lines 206-211 Link Here
206	synchronized (roles) {	207	synchronized (roles) {
207	roles.remove(role);	208	roles.remove(role);
208	}	209	}
		210	this.database.setModified();
209		211
210	}	212	}
211		213
Lines 218-223 Link Here
218	synchronized (roles) {	220	synchronized (roles) {
219	roles.clear();	221	roles.clear();
220	}	222	}
		223	this.database.setModified();
221		224
222	}	225	}
223		226
Lines 255-259 Link Here
255		258
256	}	259	}
257		260
		261
		262	/**
		263	* @see org.apache.catalina.Group#setDescription(java.lang.String)
		264	*/
		265	public void setDescription(String description) {
		266	super.setDescription(description);
		267	this.database.setModified();
		268	}
		269
		270	/**
		271	* @see org.apache.catalina.Group#setGroupname(java.lang.String)
		272	*/
		273	public void setGroupname(String groupname) {
		274	super.setGroupname(groupname);
		275	this.database.setModified();
		276	}
258		277
259	}	278	}

Lines 145-148 Link Here

(-)MemoryRole.java (+16 lines)
145	}	145	}
146		146
147		147
		148	/**
		149	* @see org.apache.catalina.Role#setDescription(java.lang.String)
		150	*/
		151	public void setDescription(String description) {
		152	super.setDescription(description);
		153	this.database.setModified();
		154	}
		155
		156	/**
		157	* @see org.apache.catalina.Role#setRolename(java.lang.String)
		158	*/
		159	public void setRolename(String rolename) {
		160	super.setRolename(rolename);
		161	this.database.setModified();
		162	}
		163
148	}	164	}

Lines 181-186 Link Here

(-)MemoryUser.java (+30 lines)
181	groups.add(group);	181	groups.add(group);
182	}	182	}
183	}	183	}
		184	this.database.setModified();
184		185
185	}	186	}
186		187
Lines 197-202 Link Here
197	roles.add(role);	198	roles.add(role);
198	}	199	}
199	}	200	}
		201	this.database.setModified();
200		202
201	}	203	}
202		204
Lines 241-246 Link Here
241	synchronized (groups) {	243	synchronized (groups) {
242	groups.remove(group);	244	groups.remove(group);
243	}	245	}
		246	this.database.setModified();
244		247
245	}	248	}
246		249
Lines 253-258 Link Here
253	synchronized (groups) {	256	synchronized (groups) {
254	groups.clear();	257	groups.clear();
255	}	258	}
		259	this.database.setModified();
256		260
257	}	261	}
258		262
Lines 267-272 Link Here
267	synchronized (roles) {	271	synchronized (roles) {
268	roles.remove(role);	272	roles.remove(role);
269	}	273	}
		274	this.database.setModified();
270		275
271	}	276	}
272		277
Lines 279-284 Link Here
279	synchronized (roles) {	284	synchronized (roles) {
280	roles.clear();	285	roles.clear();
281	}	286	}
		287	this.database.setModified();
282		288
283	}	289	}
284		290
Lines 338-342 Link Here
338		344
339	}	345	}
340		346
		347
		348	/**
		349	* @see org.apache.catalina.User#setFullName(java.lang.String)
		350	*/
		351	public void setFullName(String fullName) {
		352	super.setFullName(fullName);
		353	this.database.setModified();
		354	}
		355
		356	/**
		357	* @see org.apache.catalina.User#setPassword(java.lang.String)
		358	*/
		359	public void setPassword(String password) {
		360	super.setPassword(password);
		361	this.database.setModified();
		362	}
		363
		364	/**
		365	* @see org.apache.catalina.User#setUsername(java.lang.String)
		366	*/
		367	public void setUsername(String username) {
		368	super.setUsername(username);
		369	this.database.setModified();
		370	}
341		371
342	}	372	}