[Springframework-cvs] spring/samples/petclinic/src/org/springframework/samples/petclinic/aspects UsageLogAspect.java, 1.2, 1.2.2.1

[Juergen H. <jho...@us...>]

Update of /cvsroot/springframework/spring/samples/petclinic/src/org/springframework/samples/petclinic/aspects
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv18307/samples/petclinic/src/org/springframework/samples/petclinic/aspects

Modified Files:
      Tag: mbranch-2-0
	UsageLogAspect.java 
Log Message:
use full synchronization; return unmodifiable list

Index: UsageLogAspect.java
===================================================================
RCS file: /cvsroot/springframework/spring/samples/petclinic/src/org/springframework/samples/petclinic/aspects/UsageLogAspect.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -d -r1.2 -r1.2.2.1
*** UsageLogAspect.java	2 Feb 2007 17:20:14 -0000	1.2
--- UsageLogAspect.java	30 Nov 2007 15:51:58 -0000	1.2.2.1
***************
*** 2,5 ****
--- 2,6 ----
  
  import java.util.ArrayList;
+ import java.util.Collections;
  import java.util.List;
  
***************
*** 12,15 ****
--- 13,17 ----
   *
   * @author Rod Johnson
+  * @author Juergen Hoeller
   * @since 2.0
   */
***************
*** 24,33 ****
  
  
! 	public void setHistorySize(int historySize) {
  		this.historySize = historySize;
  		this.namesRequested = new ArrayList<String>(historySize);
  	}
  
- 
  	@Before("execution(* *.findOwners(String)) && args(name)")
  	public synchronized void logNameRequest(String name) {
--- 26,34 ----
  
  
! 	public synchronized void setHistorySize(int historySize) {
  		this.historySize = historySize;
  		this.namesRequested = new ArrayList<String>(historySize);
  	}
  
  	@Before("execution(* *.findOwners(String)) && args(name)")
  	public synchronized void logNameRequest(String name) {
***************
*** 36,46 ****
  		// @AspectJ AOP, not write perfect code here :-)
  		if (this.namesRequested.size() > this.historySize) {
! 			namesRequested.remove(0);
  		}
  		this.namesRequested.add(name);
  	}
  
! 	public List<String> getNamesRequested() {
! 		return this.namesRequested;
  	}
  
--- 37,47 ----
  		// @AspectJ AOP, not write perfect code here :-)
  		if (this.namesRequested.size() > this.historySize) {
! 			this.namesRequested.remove(0);
  		}
  		this.namesRequested.add(name);
  	}
  
! 	public synchronized List<String> getNamesRequested() {
! 		return Collections.unmodifiableList(this.namesRequested);
  	}