[jboss-cvs] JBossAS SVN: r80325 - projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/ejbthree1549.

[jboss-cvs-commits at lists.jboss.org]

Author: ALRubinger
Date: 2008-10-31 19:32:44 -0400 (Fri, 31 Oct 2008)
New Revision: 80325

Modified:
   projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/ejbthree1549/BlockingPersistenceManager.java
Log:
[EJBTHREE-1549] Fix compilation in JDK5

Modified: projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/ejbthree1549/BlockingPersistenceManager.java
===================================================================
--- projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/ejbthree1549/BlockingPersistenceManager.java	2008-10-31 20:31:14 UTC (rev 80324)
+++ projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/ejbthree1549/BlockingPersistenceManager.java	2008-10-31 23:32:44 UTC (rev 80325)
@@ -71,7 +71,7 @@
     */
    public static final CyclicBarrier BARRIER = new CyclicBarrier(2);
    
-   private Map<Object, MarshalledObject<StatefulBeanContext>> passivated = new ConcurrentHashMap<Object, MarshalledObject<StatefulBeanContext>>();
+   private Map<Object, MarshalledObject> passivated = new ConcurrentHashMap<Object, MarshalledObject>();
 
    // --------------------------------------------------------------------------------||
    // Required Implementations -------------------------------------------------------||
@@ -80,12 +80,12 @@
    public StatefulBeanContext activateSession(Object id)
    {
       log.info("Activating " + id);
-      MarshalledObject<StatefulBeanContext> o = passivated.remove(id);
+      MarshalledObject o = passivated.remove(id);
       if(o == null)
          throw new EJBException("Can't find bean " + id);
       try
       {
-         return o.get();
+         return (StatefulBeanContext)o.get();
       }
       catch (IOException e)
       {
@@ -134,7 +134,7 @@
          {
             // Mock Passivate
             log.info("Mock Passivation on " + ctx.getId());
-            passivated.put(ctx.getId(), new MarshalledObject<StatefulBeanContext>(ctx));
+            passivated.put(ctx.getId(), new MarshalledObject(ctx));
          }
          catch(IOException e)
          {
@@ -164,7 +164,7 @@
    
    public void removePassivated(Object id)
    {
-      MarshalledObject<StatefulBeanContext> o = passivated.remove(id);
+      MarshalledObject o = passivated.remove(id);
       if(o == null)
          throw new EJBException("Can't find bean " + id);
    }