You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cz...@apache.org on 2006/12/23 19:08:10 UTC
svn commit: r489911 - in
/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon:
AvalonPoolable.java AvalonServiceManager.java AvalonServiceSelector.java
PoolableFactoryBean.java PoolableProxyHandler.java
Author: cziegeler
Date: Sat Dec 23 10:08:10 2006
New Revision: 489911
URL: http://svn.apache.org/viewvc?view=rev&rev=489911
Log:
Optimize releasing of pooled components: if the component is directly released via service manager/selector we directly put it back into the pool and don't wait for the end of the request.
Added:
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/AvalonPoolable.java (with props)
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/PoolableProxyHandler.java (with props)
Modified:
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/AvalonServiceManager.java
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/AvalonServiceSelector.java
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/PoolableFactoryBean.java
Added: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/AvalonPoolable.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/AvalonPoolable.java?view=auto&rev=489911
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/AvalonPoolable.java (added)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/AvalonPoolable.java Sat Dec 23 10:08:10 2006
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.cocoon.core.container.spring.avalon;
+
+
+/**
+ * Interface marking all poolable components.
+ * This interface is used to put the poolable component back into the pool
+ * when it is released.
+ *
+ * @version $Id$
+ * @since 2.2
+ */
+public interface AvalonPoolable {
+
+ void putBackIntoAvalonPool();
+
+}
\ No newline at end of file
Propchange: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/AvalonPoolable.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/AvalonPoolable.java
------------------------------------------------------------------------------
svn:keywords = Id
Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/AvalonServiceManager.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/AvalonServiceManager.java?view=diff&rev=489911&r1=489910&r2=489911
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/AvalonServiceManager.java (original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/AvalonServiceManager.java Sat Dec 23 10:08:10 2006
@@ -69,6 +69,8 @@
* @see org.apache.avalon.framework.service.ServiceManager#release(java.lang.Object)
*/
public void release(Object component) {
- // we never release
+ if ( component instanceof AvalonPoolable ) {
+ ((AvalonPoolable)component).putBackIntoAvalonPool();
+ }
}
}
Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/AvalonServiceSelector.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/AvalonServiceSelector.java?view=diff&rev=489911&r1=489910&r2=489911
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/AvalonServiceSelector.java (original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/AvalonServiceSelector.java Sat Dec 23 10:08:10 2006
@@ -81,7 +81,9 @@
* @see org.apache.avalon.framework.service.ServiceSelector#release(java.lang.Object)
*/
public void release(Object component) {
- // nothing to do
+ if ( component instanceof AvalonPoolable ) {
+ ((AvalonPoolable)component).putBackIntoAvalonPool();
+ }
}
/**
Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/PoolableFactoryBean.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/PoolableFactoryBean.java?view=diff&rev=489911&r1=489910&r2=489911
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/PoolableFactoryBean.java (original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/PoolableFactoryBean.java Sat Dec 23 10:08:10 2006
@@ -18,8 +18,6 @@
*/
package org.apache.cocoon.core.container.spring.avalon;
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
import java.util.HashSet;
@@ -34,8 +32,6 @@
import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.BeanFactoryAware;
import org.springframework.beans.factory.FactoryBean;
-import org.springframework.web.context.request.RequestAttributes;
-import org.springframework.web.context.request.RequestContextHolder;
/**
* This factory bean adds simple pooling support to Spring.
@@ -131,6 +127,8 @@
// Get *all* interfaces
this.guessWorkInterfaces( this.beanClass, workInterfaces );
+ // Add AvalonPoolable
+ workInterfaces.add(AvalonPoolable.class);
this.interfaces = (Class[]) workInterfaces.toArray( new Class[workInterfaces.size()] );
@@ -277,7 +275,7 @@
public Object getObject() throws Exception {
return Proxy.newProxyInstance(this.getClass().getClassLoader(),
this.interfaces,
- new ProxyHandler(this));
+ new PoolableProxyHandler(this));
}
/**
@@ -322,48 +320,6 @@
for ( int i = 0; i < classInterfaces.length; i++ ) {
workInterfaces.add( classInterfaces[i] );
this.addInterfaces(classInterfaces[i].getInterfaces(), workInterfaces);
- }
- }
-
- protected static final class ProxyHandler implements InvocationHandler, Runnable {
-
- private final ThreadLocal componentHolder = new ThreadLocal();
- private final PoolableFactoryBean handler;
-
- public ProxyHandler(PoolableFactoryBean handler) {
- this.handler = handler;
- }
-
- /**
- * @see java.lang.reflect.InvocationHandler#invoke(java.lang.Object, java.lang.reflect.Method, java.lang.Object[])
- */
- public Object invoke(Object proxy, Method method, Object[] args)
- throws Throwable {
- if ( method.getName().equals("hashCode") && args == null ) {
- return new Integer(this.hashCode());
- }
- if ( this.componentHolder.get() == null ) {
- this.componentHolder.set(this.handler.getFromPool());
- RequestContextHolder.getRequestAttributes().registerDestructionCallback(ProxyHandler.class.getName() + '/' + this.handler.hashCode(), this, RequestAttributes.SCOPE_REQUEST);
- }
- try {
- return method.invoke(this.componentHolder.get(), args);
- } catch (InvocationTargetException ite) {
- throw ite.getTargetException();
- }
- }
-
- /**
- * @see java.lang.Runnable#run()
- */
- public void run() {
- try {
- final Object o = this.componentHolder.get();
- this.handler.putIntoPool(o);
- } catch (Exception ignore) {
- // we ignore this
- }
- this.componentHolder.set(null);
}
}
}
Added: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/PoolableProxyHandler.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/PoolableProxyHandler.java?view=auto&rev=489911
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/PoolableProxyHandler.java (added)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/PoolableProxyHandler.java Sat Dec 23 10:08:10 2006
@@ -0,0 +1,81 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.cocoon.core.container.spring.avalon;
+
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+import org.springframework.web.context.request.RequestAttributes;
+import org.springframework.web.context.request.RequestContextHolder;
+
+/**
+ * Proxy for all poolable components.
+ *
+ * @version $Id$
+ * @since 2.2
+ */
+public class PoolableProxyHandler implements InvocationHandler, Runnable {
+
+ private final ThreadLocal componentHolder = new ThreadLocal();
+ private final PoolableFactoryBean handler;
+ private final String attributeName;
+
+ public PoolableProxyHandler(PoolableFactoryBean handler) {
+ this.handler = handler;
+ this.attributeName = PoolableProxyHandler.class.getName() + '/' + this.handler.hashCode();
+ }
+
+ /**
+ * @see java.lang.reflect.InvocationHandler#invoke(java.lang.Object, java.lang.reflect.Method, java.lang.Object[])
+ */
+ public Object invoke(Object proxy, Method method, Object[] args)
+ throws Throwable {
+ if ( method.getName().equals("putBackIntoAvalonPool") ) {
+ this.run();
+ RequestContextHolder.getRequestAttributes().removeAttribute(this.attributeName, RequestAttributes.SCOPE_REQUEST);
+ return null;
+ }
+ if ( method.getName().equals("hashCode") && args == null ) {
+ return new Integer(this.hashCode());
+ }
+ if ( this.componentHolder.get() == null ) {
+ this.componentHolder.set(this.handler.getFromPool());
+ RequestContextHolder.getRequestAttributes().registerDestructionCallback(this.attributeName, this, RequestAttributes.SCOPE_REQUEST);
+ }
+ try {
+ return method.invoke(this.componentHolder.get(), args);
+ } catch (InvocationTargetException ite) {
+ throw ite.getTargetException();
+ }
+ }
+
+ /**
+ * @see java.lang.Runnable#run()
+ */
+ public void run() {
+ try {
+ final Object o = this.componentHolder.get();
+ if ( o != null ) {
+ this.handler.putIntoPool(o);
+ }
+ } catch (Exception ignore) {
+ // we ignore this
+ }
+ this.componentHolder.set(null);
+ }
+}
\ No newline at end of file
Propchange: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/PoolableProxyHandler.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/PoolableProxyHandler.java
------------------------------------------------------------------------------
svn:keywords = Id