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/AlgorithmParametersSpi.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/java/security/AlgorithmParametersSpi.java b/java/security/AlgorithmParametersSpi.java
index a9faa1543..bd61ce7df 100644
--- a/java/security/AlgorithmParametersSpi.java
+++ b/java/security/AlgorithmParametersSpi.java
@@ -113,8 +113,8 @@ public abstract class AlgorithmParametersSpi
    * @throws InvalidParameterSpecException if the paramSpec is an
    * invalid parameter class
    */
-  protected abstract AlgorithmParameterSpec engineGetParameterSpec(Class
-								   paramSpec)
+  protected abstract <T extends AlgorithmParameterSpec> 
+  T engineGetParameterSpec(Class<T> paramSpec)
     throws InvalidParameterSpecException;
 
 
-- 
cgit v1.2.1