User: starksm
Date: 02/03/03 23:39:03
Modified: src/main/org/jboss/ejb/plugins Tag: Branch_2_4
AbstractInstancePool.java EntityInstanceCache.java
EntityInstanceInterceptor.java
EntityInstancePool.java
EntityMultiInstanceInterceptor.java
MessageDrivenInstanceInterceptor.java
MessageDrivenInstancePool.java
SingletonStatelessSessionInstancePool.java
StatefulSessionInstanceCache.java
StatefulSessionInstanceInterceptor.java
StatefulSessionInstancePool.java
StatelessSessionInstanceInterceptor.java
StatelessSessionInstancePool.java
TimedInstancePoolFeeder.java
Log:
Undo the fix for Bug#523861 as it was not valid.
Revision Changes Path
No revision
No revision
1.9.6.8 +8 -9 jboss/src/main/org/jboss/ejb/plugins/AbstractInstancePool.java
Index: AbstractInstancePool.java
===================================================================
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/AbstractInstancePool.java,v
retrieving revision 1.9.6.7
retrieving revision 1.9.6.8
diff -u -r1.9.6.7 -r1.9.6.8
--- AbstractInstancePool.java 3 Mar 2002 06:51:07 -0000 1.9.6.7
+++ AbstractInstancePool.java 4 Mar 2002 07:39:02 -0000 1.9.6.8
@@ -6,12 +6,11 @@
*/
package org.jboss.ejb.plugins;
-import java.lang.reflect.Constructor;
import java.rmi.RemoteException;
import java.rmi.ServerException;
-import java.security.Principal;
import java.util.Stack;
import java.util.Iterator;
+import java.lang.reflect.Constructor;
import org.jboss.ejb.Container;
import org.jboss.ejb.InstancePool;
@@ -37,7 +36,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Sacha Labourey</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Scott Stark/a>
*
- * @version $Revision: 1.9.6.7 $
+ * @version $Revision: 1.9.6.8 $
*
* <p><b>Revisions:</b>
* <p><b>20010704 marcf:</b>
@@ -145,13 +144,13 @@
bean instance.
@exception Exception, thrown on ctx creation failure
*/
- public void add(Principal callerPrincipal)
+ public void add()
throws Exception
{
EnterpriseContext ctx = null;
try
{
- ctx = create(container.createBeanClassInstance(), callerPrincipal);
+ ctx = create(container.createBeanClassInstance());
}
catch (InstantiationException e)
{
@@ -173,7 +172,7 @@
@return Context with instance
@exception RemoteException
*/
- public EnterpriseContext get(Principal callerPrincipal)
+ public EnterpriseContext get()
throws Exception
{
boolean trace = log.isTraceEnabled();
@@ -189,7 +188,7 @@
if( acquired == false )
throw new ServerException("Failed to acquire the pool semaphore,
strictTimeout="+strictTimeout);
}
- EnterpriseContext ctx = internalGet(callerPrincipal);
+ EnterpriseContext ctx = internalGet();
return ctx;
}
@@ -197,7 +196,7 @@
if strictMaxSize is being used. This method obtains a ctx from the
pool if it is not empty, else a new ctx is created by calling add().
*/
- private synchronized EnterpriseContext internalGet(Principal callerPrincipal)
+ private synchronized EnterpriseContext internalGet()
throws Exception
{
EnterpriseContext ctx = null;
@@ -214,7 +213,7 @@
log.debug("The Pool for " + container.getBeanClass().getName()
+ " has been overloaded. You should change pool parameters.");
}
- add(callerPrincipal);
+ add();
ctx = (EnterpriseContext) pool.pop();
}
@@ -361,7 +360,7 @@
// Package protected ---------------------------------------------
// Protected -----------------------------------------------------
- protected abstract EnterpriseContext create(Object instance, Principal
createCaller)
+ protected abstract EnterpriseContext create(Object instance)
throws Exception;
// Private -------------------------------------------------------
1.7.2.3 +1 -1 jboss/src/main/org/jboss/ejb/plugins/EntityInstanceCache.java
Index: EntityInstanceCache.java
===================================================================
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/EntityInstanceCache.java,v
retrieving revision 1.7.2.2
retrieving revision 1.7.2.3
diff -u -r1.7.2.2 -r1.7.2.3
--- EntityInstanceCache.java 3 Mar 2002 06:51:07 -0000 1.7.2.2
+++ EntityInstanceCache.java 4 Mar 2002 07:39:02 -0000 1.7.2.3
@@ -21,7 +21,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Simone Bordet</a>
* @author <a href="[EMAIL PROTECTED]">Bill Burke</a>
- * @version $Revision: 1.7.2.2 $
+ * @version $Revision: 1.7.2.3 $
*/
public class EntityInstanceCache
extends AbstractInstanceCache
@@ -109,7 +109,7 @@
}
protected EnterpriseContext acquireContext() throws Exception
{
- return m_container.getInstancePool().get(null);
+ return m_container.getInstancePool().get();
}
protected void freeContext(EnterpriseContext ctx)
{
1.30.2.8 +3 -5
jboss/src/main/org/jboss/ejb/plugins/EntityInstanceInterceptor.java
Index: EntityInstanceInterceptor.java
===================================================================
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/EntityInstanceInterceptor.java,v
retrieving revision 1.30.2.7
retrieving revision 1.30.2.8
diff -u -r1.30.2.7 -r1.30.2.8
--- EntityInstanceInterceptor.java 3 Mar 2002 06:51:07 -0000 1.30.2.7
+++ EntityInstanceInterceptor.java 4 Mar 2002 07:39:02 -0000 1.30.2.8
@@ -55,7 +55,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Marc Fleury</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Scott Stark</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Bill Burke</a>
-* @version $Revision: 1.30.2.7 $
+* @version $Revision: 1.30.2.8 $
*
* <p><b>Revisions:</b><br>
* <p><b>2001/06/28: marcf</b>
@@ -133,9 +133,8 @@
throws Exception
{
// Get context
- InstancePool pool = container.getInstancePool();
- EntityEnterpriseContext ctx =
(EntityEnterpriseContext)pool.get(mi.getPrincipal());
-
+ EntityEnterpriseContext ctx =
(EntityEnterpriseContext)((EntityContainer)getContainer()).getInstancePool().get();
+
// Pass it to the method invocation
mi.setEnterpriseContext(ctx);
@@ -179,8 +178,7 @@
CacheKey key = (CacheKey) mi.getId();
// The context
- InstanceCache cache = container.getInstanceCache();
- EntityEnterpriseContext ctx = (EntityEnterpriseContext)cache.get(key);
+ EntityEnterpriseContext ctx = (EntityEnterpriseContext)
container.getInstanceCache().get(key);
boolean trace = log.isTraceEnabled();
if( trace ) log.trace("Begin invoke, key="+key);
1.9.6.6 +2 -3 jboss/src/main/org/jboss/ejb/plugins/EntityInstancePool.java
Index: EntityInstancePool.java
===================================================================
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/EntityInstancePool.java,v
retrieving revision 1.9.6.5
retrieving revision 1.9.6.6
diff -u -r1.9.6.5 -r1.9.6.6
--- EntityInstancePool.java 3 Mar 2002 06:51:07 -0000 1.9.6.5
+++ EntityInstancePool.java 4 Mar 2002 07:39:02 -0000 1.9.6.6
@@ -7,7 +7,6 @@
package org.jboss.ejb.plugins;
import java.rmi.RemoteException;
-import java.security.Principal;
import javax.ejb.EJBException;
@@ -24,7 +23,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Marc Fleury</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Andreas Schaefer</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Sacha Labourey</a>
- * @version $Revision: 1.9.6.5 $
+ * @version $Revision: 1.9.6.6 $
*
* <p><b>Revisions:</b>
* <p><b>20010718 andreas schaefer:</b>
@@ -81,10 +80,10 @@
// Package protected ---------------------------------------------
// Protected -----------------------------------------------------
- protected EnterpriseContext create(Object instance, Principal createCaller)
+ protected EnterpriseContext create(Object instance)
throws Exception
{
- return new EntityEnterpriseContext(instance, getContainer(), createCaller);
+ return new EntityEnterpriseContext(instance, getContainer());
}
// Private -------------------------------------------------------
1.1.4.5 +3 -5
jboss/src/main/org/jboss/ejb/plugins/EntityMultiInstanceInterceptor.java
Index: EntityMultiInstanceInterceptor.java
===================================================================
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/EntityMultiInstanceInterceptor.java,v
retrieving revision 1.1.4.4
retrieving revision 1.1.4.5
diff -u -r1.1.4.4 -r1.1.4.5
--- EntityMultiInstanceInterceptor.java 3 Mar 2002 06:51:07 -0000 1.1.4.4
+++ EntityMultiInstanceInterceptor.java 4 Mar 2002 07:39:02 -0000 1.1.4.5
@@ -44,7 +44,7 @@
*
*
* @author <a href="mailto:[EMAIL PROTECTED]">Bill Burke</a>
- * @version $Revision: 1.1.4.4 $
+ * @version $Revision: 1.1.4.5 $
*
* <p><b>Revisions:</b><br>
* <p><b>2001/08/08: billb</b>
@@ -81,9 +81,8 @@
throws Exception
{
// Get context
- InstancePool pool = container.getInstancePool();
- EntityEnterpriseContext ctx = (EntityEnterpriseContext)
pool.get(mi.getPrincipal());
-
+ EntityEnterpriseContext ctx =
(EntityEnterpriseContext)((EntityContainer)getContainer()).getInstancePool().get();
+
// Pass it to the method invocation
mi.setEnterpriseContext(ctx);
@@ -108,8 +107,7 @@
}
if (ctx == null)
{
- InstancePool pool = container.getInstancePool();
- ctx = (EntityEnterpriseContext) pool.get(mi.getPrincipal());
+ ctx = (EntityEnterpriseContext)container.getInstancePool().get();
ctx.setCacheKey(key);
ctx.setId(key.getId());
container.getPersistenceManager().activateEntity(ctx);
1.3.6.4 +2 -2
jboss/src/main/org/jboss/ejb/plugins/MessageDrivenInstanceInterceptor.java
Index: MessageDrivenInstanceInterceptor.java
===================================================================
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/MessageDrivenInstanceInterceptor.java,v
retrieving revision 1.3.6.3
retrieving revision 1.3.6.4
diff -u -r1.3.6.3 -r1.3.6.4
--- MessageDrivenInstanceInterceptor.java 3 Mar 2002 06:51:07 -0000 1.3.6.3
+++ MessageDrivenInstanceInterceptor.java 4 Mar 2002 07:39:02 -0000 1.3.6.4
@@ -22,7 +22,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Rickard �berg</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Jason Dillon</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Scott Stark</a>
- * @version $Revision: 1.3.6.3 $
+ * @version $Revision: 1.3.6.4 $
*/
public class MessageDrivenInstanceInterceptor
extends AbstractInterceptor
@@ -70,9 +70,9 @@
{
// Get context
InstancePool pool = container.getInstancePool();
- EnterpriseContext ctx = pool.get(mi.getPrincipal());
+ EnterpriseContext ctx = pool.get();
mi.setEnterpriseContext(ctx);
-
+
// There is no need for synchronization since the instance is always
// fresh also there should never be a tx associated with the instance.
try
1.3.6.3 +3 -3
jboss/src/main/org/jboss/ejb/plugins/MessageDrivenInstancePool.java
Index: MessageDrivenInstancePool.java
===================================================================
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/MessageDrivenInstancePool.java,v
retrieving revision 1.3.6.2
retrieving revision 1.3.6.3
diff -u -r1.3.6.2 -r1.3.6.3
--- MessageDrivenInstancePool.java 3 Mar 2002 06:51:07 -0000 1.3.6.2
+++ MessageDrivenInstancePool.java 4 Mar 2002 07:39:02 -0000 1.3.6.3
@@ -7,7 +7,7 @@
package org.jboss.ejb.plugins;
import java.rmi.RemoteException;
-import java.security.Principal;
+
import org.jboss.ejb.Container;
import org.jboss.ejb.EnterpriseContext;
import org.jboss.ejb.MessageDrivenEnterpriseContext;
@@ -19,7 +19,7 @@
* @author Rickard �berg ([EMAIL PROTECTED])
* @author Peter Antman ([EMAIL PROTECTED])
* @author <a href="mailto:[EMAIL PROTECTED]">Sacha Labourey</a>
- * @version $Revision: 1.3.6.2 $
+ * @version $Revision: 1.3.6.3 $
*
* <p><b>Revisions:</b>
* <p><b>20010920 Sacha Labourey:</b>
@@ -52,10 +52,10 @@
// Package protected ---------------------------------------------
// Protected -----------------------------------------------------
- protected EnterpriseContext create(Object instance, Principal createCaller)
+ protected EnterpriseContext create(Object instance)
throws Exception
{
- return new MessageDrivenEnterpriseContext(instance, getContainer(),
createCaller);
+ return new MessageDrivenEnterpriseContext(instance, getContainer());
}
// Private -------------------------------------------------------
1.6.6.5 +7 -8
jboss/src/main/org/jboss/ejb/plugins/SingletonStatelessSessionInstancePool.java
Index: SingletonStatelessSessionInstancePool.java
===================================================================
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/SingletonStatelessSessionInstancePool.java,v
retrieving revision 1.6.6.4
retrieving revision 1.6.6.5
diff -u -r1.6.6.4 -r1.6.6.5
--- SingletonStatelessSessionInstancePool.java 3 Mar 2002 06:51:07 -0000
1.6.6.4
+++ SingletonStatelessSessionInstancePool.java 4 Mar 2002 07:39:02 -0000
1.6.6.5
@@ -8,10 +8,9 @@
import java.rmi.RemoteException;
import java.rmi.ServerException;
-import java.security.Principal;
+
import javax.ejb.EJBHome;
-import org.w3c.dom.Element;
import org.jboss.deployment.DeploymentException;
import org.jboss.ejb.Container;
import org.jboss.ejb.InstancePool;
@@ -19,6 +18,7 @@
import org.jboss.ejb.StatelessSessionEnterpriseContext;
import org.jboss.metadata.XmlLoadable;
import org.jboss.metadata.MetaData;
+import org.w3c.dom.Element;
import org.jboss.logging.Logger;
@@ -28,7 +28,7 @@
*
* @see <related>
* @author Rickard �berg ([EMAIL PROTECTED])
- * @version $Revision: 1.6.6.4 $
+ * @version $Revision: 1.6.6.5 $
*/
public class SingletonStatelessSessionInstancePool
implements InstancePool, XmlLoadable
@@ -83,7 +83,7 @@
* @return Context /w instance
* @exception RemoteException
*/
- public synchronized EnterpriseContext get(Principal callerPrincipal)
+ public synchronized EnterpriseContext get()
throws Exception
{
// Wait while someone else is using it
@@ -97,7 +97,7 @@
{
try
{
- ctx = create(con.getBeanClass().newInstance(), con, callerPrincipal);
+ ctx = create(con.getBeanClass().newInstance(), con);
} catch (InstantiationException e)
{
throw new ServerException("Could not instantiate bean", e);
@@ -147,7 +147,7 @@
/**
* Add a instance in the pool
*/
- public void add(Principal callerPrincipal)
+ public void add()
throws Exception
{
// Empty
@@ -173,11 +173,10 @@
// Package protected ---------------------------------------------
// Protected -----------------------------------------------------
- protected EnterpriseContext create(Object instance, Container con,
- Principal createCaller)
+ protected EnterpriseContext create(Object instance, Container con)
throws Exception
{
- return new StatelessSessionEnterpriseContext(instance, con, createCaller);
+ return new StatelessSessionEnterpriseContext(instance, con);
}
// Private -------------------------------------------------------
1.7.2.4 +1 -1
jboss/src/main/org/jboss/ejb/plugins/StatefulSessionInstanceCache.java
Index: StatefulSessionInstanceCache.java
===================================================================
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/StatefulSessionInstanceCache.java,v
retrieving revision 1.7.2.3
retrieving revision 1.7.2.4
diff -u -r1.7.2.3 -r1.7.2.4
--- StatefulSessionInstanceCache.java 3 Mar 2002 06:51:07 -0000 1.7.2.3
+++ StatefulSessionInstanceCache.java 4 Mar 2002 07:39:02 -0000 1.7.2.4
@@ -31,7 +31,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Simone Bordet</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Sebastien Alborini</a>
- * @version $Revision: 1.7.2.3 $
+ * @version $Revision: 1.7.2.4 $
*/
public class StatefulSessionInstanceCache
extends AbstractInstanceCache
@@ -74,7 +74,7 @@
}
protected EnterpriseContext acquireContext() throws Exception
{
- return m_container.getInstancePool().get(null);
+ return m_container.getInstancePool().get();
}
protected void freeContext(EnterpriseContext ctx)
{
1.15.6.4 +1 -10
jboss/src/main/org/jboss/ejb/plugins/StatefulSessionInstanceInterceptor.java
Index: StatefulSessionInstanceInterceptor.java
===================================================================
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/StatefulSessionInstanceInterceptor.java,v
retrieving revision 1.15.6.3
retrieving revision 1.15.6.4
diff -u -r1.15.6.3 -r1.15.6.4
--- StatefulSessionInstanceInterceptor.java 3 Mar 2002 06:51:07 -0000
1.15.6.3
+++ StatefulSessionInstanceInterceptor.java 4 Mar 2002 07:39:02 -0000
1.15.6.4
@@ -30,7 +30,6 @@
import org.jboss.ejb.EnterpriseContext;
import org.jboss.ejb.MethodInvocation;
import org.jboss.metadata.SessionMetaData;
-import org.jboss.security.SecurityAssociation;
/**
* This container acquires the given instance.
@@ -39,7 +38,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Marc Fleury</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Bill Burke</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Scott Stark</a>
- * @version $Revision: 1.15.6.3 $
+ * @version $Revision: 1.15.6.4 $
*
* <p><b>Revisions:</b>
* <p><b>20010704 marcf</b>
@@ -107,7 +106,7 @@
{
// get a new context from the pool (this is a home method call)
InstancePool pool = container.getInstancePool();
- EnterpriseContext ctx = pool.get(mi.getPrincipal());
+ EnterpriseContext ctx = pool.get();
// set the context on the methodInvocation
mi.setEnterpriseContext(ctx);
@@ -190,14 +189,6 @@
lock.sync(); // synchronized(ctx)
try // lock.sync
{
- /* The security context must be established before the cache
- lookup because the SecurityInterceptor is after the instance
- interceptor and handles of passivated sessions expect that they are
- restored with the correct security context since the handles
- not serialize the principal and credential information.
- */
- SecurityAssociation.setPrincipal(mi.getPrincipal());
- SecurityAssociation.setCredential(mi.getCredential());
// Get context
ctx = cache.get(methodID);
// Associate it with the method invocation
1.4.6.3 +3 -4
jboss/src/main/org/jboss/ejb/plugins/StatefulSessionInstancePool.java
Index: StatefulSessionInstancePool.java
===================================================================
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/StatefulSessionInstancePool.java,v
retrieving revision 1.4.6.2
retrieving revision 1.4.6.3
diff -u -r1.4.6.2 -r1.4.6.3
--- StatefulSessionInstancePool.java 3 Mar 2002 06:51:07 -0000 1.4.6.2
+++ StatefulSessionInstancePool.java 4 Mar 2002 07:39:02 -0000 1.4.6.3
@@ -7,7 +7,6 @@
package org.jboss.ejb.plugins;
import java.rmi.RemoteException;
-import java.security.Principal;
import org.jboss.ejb.Container;
import org.jboss.ejb.EnterpriseContext;
@@ -19,7 +18,7 @@
* @see <related>
* @author <a href="mailto:[EMAIL PROTECTED]">Marc Fleury</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Andreas Schaefer</a>
-* @version $Revision: 1.4.6.2 $
+* @version $Revision: 1.4.6.3 $
*
* <p><b>Revisions:</b>
* <p><b>20010718 andreas schaefer:</b>
@@ -46,13 +45,13 @@
}
// Protected -----------------------------------------------------
- protected EnterpriseContext create(Object instance, Principal createCaller)
+ protected EnterpriseContext create(Object instance)
throws Exception
{
// The instance is created by the caller and is a newInstance();
- return new StatefulSessionEnterpriseContext(instance, getContainer(),
createCaller);
+ return new StatefulSessionEnterpriseContext(instance, getContainer());
}
-
+
// Private -------------------------------------------------------
// Inner classes -------------------------------------------------
1.6.6.4 +1 -1
jboss/src/main/org/jboss/ejb/plugins/StatelessSessionInstanceInterceptor.java
Index: StatelessSessionInstanceInterceptor.java
===================================================================
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/StatelessSessionInstanceInterceptor.java,v
retrieving revision 1.6.6.3
retrieving revision 1.6.6.4
diff -u -r1.6.6.3 -r1.6.6.4
--- StatelessSessionInstanceInterceptor.java 3 Mar 2002 06:51:07 -0000 1.6.6.3
+++ StatelessSessionInstanceInterceptor.java 4 Mar 2002 07:39:02 -0000 1.6.6.4
@@ -33,7 +33,7 @@
*
* @author Rickard �berg ([EMAIL PROTECTED])
* @author [EMAIL PROTECTED]
- * @version $Revision: 1.6.6.3 $
+ * @version $Revision: 1.6.6.4 $
*/
public class StatelessSessionInstanceInterceptor
extends AbstractInterceptor
@@ -71,7 +71,7 @@
{
// Get context
InstancePool pool = container.getInstancePool();
- EnterpriseContext ctx = pool.get(mi.getPrincipal());
+ EnterpriseContext ctx = pool.get();
mi.setEnterpriseContext(ctx);
// There is no need for synchronization since the instance is always fresh
also there should
1.4.6.4 +2 -3
jboss/src/main/org/jboss/ejb/plugins/StatelessSessionInstancePool.java
Index: StatelessSessionInstancePool.java
===================================================================
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/StatelessSessionInstancePool.java,v
retrieving revision 1.4.6.3
retrieving revision 1.4.6.4
diff -u -r1.4.6.3 -r1.4.6.4
--- StatelessSessionInstancePool.java 3 Mar 2002 06:51:07 -0000 1.4.6.3
+++ StatelessSessionInstancePool.java 4 Mar 2002 07:39:02 -0000 1.4.6.4
@@ -7,7 +7,6 @@
package org.jboss.ejb.plugins;
import java.rmi.RemoteException;
-import java.security.Principal;
import org.jboss.ejb.Container;
import org.jboss.ejb.EnterpriseContext;
@@ -20,7 +19,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Rickard �berg</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Andreas Schaefer</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Sacha Labourey</a>
- * @version $Revision: 1.4.6.3 $
+ * @version $Revision: 1.4.6.4 $
*
* <p><b>Revisions:</b>
* <p><b>20010718 andreas schaefer:</b>
@@ -57,10 +56,10 @@
// Package protected ---------------------------------------------
// Protected -----------------------------------------------------
- protected EnterpriseContext create(Object instance, Principal createCaller)
+ protected EnterpriseContext create(Object instance)
throws Exception
{
- return new StatelessSessionEnterpriseContext(instance, getContainer(),
createCaller);
+ return new StatelessSessionEnterpriseContext(instance, getContainer());
}
// Private -------------------------------------------------------
1.1.2.4 +1 -2
jboss/src/main/org/jboss/ejb/plugins/TimedInstancePoolFeeder.java
Index: TimedInstancePoolFeeder.java
===================================================================
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/TimedInstancePoolFeeder.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- TimedInstancePoolFeeder.java 3 Mar 2002 06:51:07 -0000 1.1.2.3
+++ TimedInstancePoolFeeder.java 4 Mar 2002 07:39:02 -0000 1.1.2.4
@@ -50,8 +50,7 @@
{
for (int i=0 ; i < increment ; i++)
{
- // This may fail for a secured stateless bean
- ip.add(null);
+ ip.add();
}
}
}
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development