From da66af5951b18b6f5e8752cbbe11f5f842332a33 Mon Sep 17 00:00:00 2001
From: Andrew John Hughes <gnu_andrew@member.fsf.org>
Date: Sun, 10 Dec 2006 20:25:39 +0000
Subject: 2006-12-10  Andrew John Hughes  <gnu_andrew@member.fsf.org>

	* Merge of generics-branch to HEAD (woohoo!)
---
 java/security/KeyFactory.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'java/security/KeyFactory.java')

diff --git a/java/security/KeyFactory.java b/java/security/KeyFactory.java
index 914975d77..043dd59a1 100644
--- a/java/security/KeyFactory.java
+++ b/java/security/KeyFactory.java
@@ -255,7 +255,7 @@ public class KeyFactory
    *           the requested key specification is inappropriate for this key or
    *           the key is unrecognized.
    */
-  public final KeySpec getKeySpec(Key key, Class keySpec)
+  public final <T extends KeySpec> T getKeySpec(Key key, Class<T> keySpec)
     throws InvalidKeySpecException
   {
     return keyFacSpi.engineGetKeySpec(key, keySpec);
-- 
cgit v1.2.1