openamf/src/java/org/openamf/invoker JMXServiceInvoker.java,1.10,1.11 JavaServiceInvoker.java,1.25,1.26 ServiceInvoker.java,1.12,1.13 EJBServiceInvoker.java,1.11,1.12

Update of /cvsroot/openamf/openamf/src/java/org/openamf/invoker
In directory sc8-pr-cvs1:/tmp/cvs-serv18641/src/java/org/openamf/invoker

Modified Files:
	JMXServiceInvoker.java JavaServiceInvoker.java 
	ServiceInvoker.java EJBServiceInvoker.java 
Log Message:
changed "persistant" to "persistent"


Index: JMXServiceInvoker.java
===================================================================
RCS file: /cvsroot/openamf/openamf/src/java/org/openamf/invoker/JMXServiceInvoker.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** JMXServiceInvoker.java	15 Aug 2003 22:03:42 -0000	1.10
--- JMXServiceInvoker.java	29 Nov 2003 20:18:03 -0000	1.11
***************
*** 72,76 ****
  	}
  
! 	public String getPersistantServiceName() {
  		return null;
  	}
--- 72,76 ----
  	}
  
! 	public String getPersistentServiceName() {
  		return null;
  	}

Index: JavaServiceInvoker.java
===================================================================
RCS file: /cvsroot/openamf/openamf/src/java/org/openamf/invoker/JavaServiceInvoker.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** JavaServiceInvoker.java	27 Nov 2003 04:52:15 -0000	1.25
--- JavaServiceInvoker.java	29 Nov 2003 20:18:04 -0000	1.26
***************
*** 44,48 ****
  		try {
  			serviceClass = Thread.currentThread().getContextClassLoader().loadClass(request.getServiceName());
! 			service = persistantServiceObject;
  			if (service == null) {
  				service = serviceClass.newInstance();
--- 44,48 ----
  		try {
  			serviceClass = Thread.currentThread().getContextClassLoader().loadClass(request.getServiceName());
! 			service = persistentServiceObject;
  			if (service == null) {
  				service = serviceClass.newInstance();
***************
*** 53,57 ****
  					request.getServiceMethodName(),
  					request.getParameters());
! 			persistantServiceObject = service;
  		} catch (InvocationTargetException e) {
  			//use the cause since the exception is thrown when 
--- 53,57 ----
  					request.getServiceMethodName(),
  					request.getParameters());
! 			persistentServiceObject = service;
  		} catch (InvocationTargetException e) {
  			//use the cause since the exception is thrown when 
***************
*** 69,73 ****
  	}
  
! 	public String getPersistantServiceName() {
  		return request.getServiceName();
  	}
--- 69,73 ----
  	}
  
! 	public String getPersistentServiceName() {
  		return request.getServiceName();
  	}

Index: ServiceInvoker.java
===================================================================
RCS file: /cvsroot/openamf/openamf/src/java/org/openamf/invoker/ServiceInvoker.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** ServiceInvoker.java	15 Aug 2003 22:03:42 -0000	1.12
--- ServiceInvoker.java	29 Nov 2003 20:18:04 -0000	1.13
***************
*** 25,29 ****
  	protected HttpServletRequest httpServletRequest;
  	protected ServletContext servletContext;
! 	protected Object persistantServiceObject;
  
  	public ServiceInvoker(
--- 25,29 ----
  	protected HttpServletRequest httpServletRequest;
  	protected ServletContext servletContext;
! 	protected Object persistentServiceObject;
  
  	public ServiceInvoker(
***************
*** 67,80 ****
  	}
  
! 	public String getPersistantServiceName() {
  		return null;
  	}
  
! 	public Object getPersistantServiceObject() {
! 		return persistantServiceObject;
  	}
  
! 	public void setPersistantServiceObject(Object persistantServiceObject) {
! 		this.persistantServiceObject = persistantServiceObject;
  	}
  
--- 67,80 ----
  	}
  
! 	public String getPersistentServiceName() {
  		return null;
  	}
  
! 	public Object getPersistentServiceObject() {
! 		return persistentServiceObject;
  	}
  
! 	public void setPersistentServiceObject(Object persistentServiceObject) {
! 		this.persistentServiceObject = persistentServiceObject;
  	}
  

Index: EJBServiceInvoker.java
===================================================================
RCS file: /cvsroot/openamf/openamf/src/java/org/openamf/invoker/EJBServiceInvoker.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** EJBServiceInvoker.java	19 Sep 2003 21:33:30 -0000	1.11
--- EJBServiceInvoker.java	29 Nov 2003 20:18:04 -0000	1.12
***************
*** 53,60 ****
  			
  			if (persistService) {
! 				log.debug("Trying to get Handle from persistantObject");
! 				Handle handle = (Handle)getPersistantServiceObject();
  				if (handle != null) {
! 					log.debug("Got Handle from persistantObject");
  					ejb = handle.getEJBObject();
  				}
--- 53,60 ----
  			
  			if (persistService) {
! 				log.debug("Trying to get Handle from persistentObject");
! 				Handle handle = (Handle)getPersistentServiceObject();
  				if (handle != null) {
! 					log.debug("Got Handle from persistentObject");
  					ejb = handle.getEJBObject();
  				}
***************
*** 81,86 ****
  			if (persistService) {
  				if (ejb instanceof EJBObject) {
! 					log.debug("setting persistantObject = Handle");
! 					setPersistantServiceObject(((EJBObject)ejb).getHandle());
  				}
  			}
--- 81,86 ----
  			if (persistService) {
  				if (ejb instanceof EJBObject) {
! 					log.debug("setting persistentObject = Handle");
! 					setPersistentServiceObject(((EJBObject)ejb).getHandle());
  				}
  			}
***************
*** 132,136 ****
  	}
  
! 	/* Used to check if this is a persistant service (Stateful Session Bean or Entity Bean)
  	 * @see org.openamf.invoker.ServiceInvoker#prepare(org.openamf.ServiceRequest)
  	 */
--- 132,136 ----
  	}
  
! 	/* Used to check if this is a persistent service (Stateful Session Bean or Entity Bean)
  	 * @see org.openamf.invoker.ServiceInvoker#prepare(org.openamf.ServiceRequest)
  	 */




-------------------------------------------------------
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive?  Does it
help you create better code?  SHARE THE LOVE, and help us help
YOU!  Click Here: http://sourceforge.net/donate/