diff --git a/core-tiger/src/main/java/org/springframework/ldap/core/simple/ContextMapperCallbackHandlerWithControls.java b/core-tiger/src/main/java/org/springframework/ldap/core/simple/ContextMapperCallbackHandlerWithControls.java
index 0313817a..297d9df0 100644
--- a/core-tiger/src/main/java/org/springframework/ldap/core/simple/ContextMapperCallbackHandlerWithControls.java
+++ b/core-tiger/src/main/java/org/springframework/ldap/core/simple/ContextMapperCallbackHandlerWithControls.java
@@ -1 +1,70 @@
-/*
 * Copyright 2005-2008 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.
 * You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
package org.springframework.ldap.core.simple;

import javax.naming.Binding;
import javax.naming.NameClassPair;
import javax.naming.ldap.HasControls;

import org.springframework.ldap.core.ContextMapperCallbackHandler;
import org.springframework.ldap.core.ObjectRetrievalException;

/**
 * Currently only per request controls can be inspected via the post process
 * method on a context processor. If a request control gives a different value
 * for each search result, then this cannot be inspected using the existing
 * support classes. An example control that requires this feature would be
 * 1.3.6.1.4.1.42.2.27.9.5.8 Account usability control, that can be used with
 * OpenLDAP or Sun directory server.
 * 
 * The extended callback handler can pass hasControls to mapper.
 * 
 * @author Tim Terry
 * @author Ulrik Sandberg
 */
public class ContextMapperCallbackHandlerWithControls extends ContextMapperCallbackHandler {

	private ParameterizedContextMapperWithControls<?> mapper = null;

	public ContextMapperCallbackHandlerWithControls(final ParameterizedContextMapperWithControls<?> mapper) {
		super(mapper);
		this.mapper = mapper;
	}

	/*
	 * @see org.springframework.ldap.core.ContextMapperCallbackHandler#
	 * getObjectFromNameClassPair(javax.naming.NameClassPair)
	 */
	public Object getObjectFromNameClassPair(final NameClassPair nameClassPair) {
		if (!(nameClassPair instanceof Binding)) {
			throw new IllegalArgumentException("Parameter must be an instance of Binding");
		}

		Binding binding = (Binding) nameClassPair;
		Object object = binding.getObject();
		if (object == null) {
			throw new ObjectRetrievalException("Binding did not contain any object.");
		}
		Object result = null;
		if (nameClassPair instanceof HasControls) {
			result = mapper.mapFromContextWithControls(object, (HasControls) nameClassPair);
		}
		else {
			result = mapper.mapFromContext(object);
		}
		return result;
	}
}
\ No newline at end of file
+/*
+ * Copyright 2005-2008 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.ldap.core.simple;
+
+import javax.naming.Binding;
+import javax.naming.NameClassPair;
+import javax.naming.ldap.HasControls;
+
+import org.springframework.ldap.core.ContextMapperCallbackHandler;
+import org.springframework.ldap.core.ObjectRetrievalException;
+
+/**
+ * Currently only per request controls can be inspected via the post process
+ * method on a context processor. If a request control gives a different value
+ * for each search result, then this cannot be inspected using the existing
+ * support classes. An example control that requires this feature would be
+ * 1.3.6.1.4.1.42.2.27.9.5.8 Account usability control, that can be used with
+ * for example the Sun ONE or the OpenDS directory servers.
+ * 
+ * The extended callback handler can pass hasControls to mapper.
+ * 
+ * @author Tim Terry
+ * @author Ulrik Sandberg
+ */
+public class ContextMapperCallbackHandlerWithControls extends ContextMapperCallbackHandler {
+
+	private ParameterizedContextMapperWithControls<?> mapper = null;
+
+	public ContextMapperCallbackHandlerWithControls(final ParameterizedContextMapperWithControls<?> mapper) {
+		super(mapper);
+		this.mapper = mapper;
+	}
+
+	/*
+	 * @see org.springframework.ldap.core.ContextMapperCallbackHandler#
+	 * getObjectFromNameClassPair(javax.naming.NameClassPair)
+	 */
+	public Object getObjectFromNameClassPair(final NameClassPair nameClassPair) {
+		if (!(nameClassPair instanceof Binding)) {
+			throw new IllegalArgumentException("Parameter must be an instance of Binding");
+		}
+
+		Binding binding = (Binding) nameClassPair;
+		Object object = binding.getObject();
+		if (object == null) {
+			throw new ObjectRetrievalException("Binding did not contain any object.");
+		}
+		Object result = null;
+		if (nameClassPair instanceof HasControls) {
+			result = mapper.mapFromContextWithControls(object, (HasControls) nameClassPair);
+		}
+		else {
+			result = mapper.mapFromContext(object);
+		}
+		return result;
+	}
+}