diff --git a/org.springframework.context/src/main/java/org/springframework/context/annotation/AnnotationConfigApplicationContext.java b/org.springframework.context/src/main/java/org/springframework/context/annotation/AnnotationConfigApplicationContext.java
index 2427d6c174..ebf1eee38f 100644
--- a/org.springframework.context/src/main/java/org/springframework/context/annotation/AnnotationConfigApplicationContext.java
+++ b/org.springframework.context/src/main/java/org/springframework/context/annotation/AnnotationConfigApplicationContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * Copyright 2002-2010 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -49,7 +49,7 @@ public class AnnotationConfigApplicationContext extends GenericApplicationContex
 
 	/**
  	 * Create a new AnnotationConfigApplicationContext that needs to be populated
-	 * through {@link #add} calls and then manually {@link #refresh refreshed}.
+	 * through {@link #register} calls and then manually {@link #refresh refreshed}.
 	 */
 	public AnnotationConfigApplicationContext() {
 	}
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/support/RequestContext.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/support/RequestContext.java
index 4ff1764f77..ed5ab9e8ec 100644
--- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/support/RequestContext.java
+++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/support/RequestContext.java
@@ -350,7 +350,7 @@ public class RequestContext {
 	 * Falls back to <code>false</code> in case of no explicit default given.
 	 */
 	public boolean isDefaultHtmlEscape() {
-		return (this.defaultHtmlEscape != null && this.defaultHtmlEscape);
+		return (this.defaultHtmlEscape != null && this.defaultHtmlEscape.booleanValue());
 	}
 
 	/**