You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2011/03/31 17:34:49 UTC

svn commit: r1087342 - /wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/mapper/CryptoMapper.java

Author: mgrigorov
Date: Thu Mar 31 15:34:49 2011
New Revision: 1087342

URL: http://svn.apache.org/viewvc?rev=1087342&view=rev
Log:
WICKET-3581 CryptoMapper ignores the IProvider<ICrypt> argument

Take into account the provided Provider<ICrypt>


Modified:
    wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/mapper/CryptoMapper.java

Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/mapper/CryptoMapper.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/mapper/CryptoMapper.java?rev=1087342&r1=1087341&r2=1087342&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/mapper/CryptoMapper.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/mapper/CryptoMapper.java Thu Mar 31 15:34:49 2011
@@ -23,7 +23,6 @@ import org.apache.wicket.request.Request
 import org.apache.wicket.request.Url;
 import org.apache.wicket.util.IProvider;
 import org.apache.wicket.util.crypt.ICrypt;
-import org.apache.wicket.util.crypt.ICryptFactory;
 import org.apache.wicket.util.string.Strings;
 
 /**
@@ -37,11 +36,29 @@ public class CryptoMapper implements IRe
 	private final IProvider<ICrypt> cryptProvider;
 	private final Application application;
 
+	/**
+	 * Construct.
+	 * 
+	 * @param wrappedMapper
+	 *            the non-crypted request mapper
+	 * @param application
+	 *            the current application
+	 */
 	public CryptoMapper(IRequestMapper wrappedMapper, Application application)
 	{
 		this(wrappedMapper, application, new ApplicationCryptProvider(application));
 	}
 
+	/**
+	 * Construct.
+	 * 
+	 * @param wrappedMapper
+	 *            the non-crypted request mapper
+	 * @param application
+	 *            the current application
+	 * @param cryptProvider
+	 *            the custom crypt provider
+	 */
 	public CryptoMapper(IRequestMapper wrappedMapper, Application application,
 		IProvider<ICrypt> cryptProvider)
 	{
@@ -81,10 +98,10 @@ public class CryptoMapper implements IRe
 
 	private ICrypt getCrypt()
 	{
-		ICryptFactory factory = Application.get().getSecuritySettings().getCryptFactory();
-		return factory.newCrypt();
+		return cryptProvider.get();
 	}
 
+
 	private Url encryptUrl(Url url)
 	{
 		Url encrypted = new Url();