weaver 2004/05/27 12:52:43
Modified: portal/src/java/org/apache/jetspeed/pipeline/valve/impl
CleanupValveImpl.java
Log:
see JS2-40: <http://nagoya.apache.org/jira/browse/JS2-40>. Added logic to
commit/close the
current thread's PersistenceStore. No more crappy timeout settings to check for in
store inactivity.
Revision Changes Path
1.4 +22 -1
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/pipeline/valve/impl/CleanupValveImpl.java
Index: CleanupValveImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/pipeline/valve/impl/CleanupValveImpl.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CleanupValveImpl.java 8 Mar 2004 00:30:04 -0000 1.3
+++ CleanupValveImpl.java 27 May 2004 19:52:43 -0000 1.4
@@ -22,6 +22,9 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.jetspeed.Jetspeed;
+import org.apache.jetspeed.components.persistence.store.PersistenceStore;
+import org.apache.jetspeed.components.persistence.store.Transaction;
import org.apache.jetspeed.pipeline.PipelineException;
import org.apache.jetspeed.pipeline.valve.AbstractValve;
import org.apache.jetspeed.pipeline.valve.CleanupValve;
@@ -78,6 +81,24 @@
{
log.error("CleanupValveImpl: failed while trying to render fragment " +
fragment);
log.error("CleanupValveImpl: Unable to complete all renderings", e);
+ }
+
+ PersistenceStore persistenceStore = (PersistenceStore)
Jetspeed.getComponentManager().getComponent(PersistenceStore.class);
+ try
+ {
+ if(persistenceStore != null)
+ {
+ Transaction tx = persistenceStore.getTransaction();
+ if(tx.isOpen())
+ {
+ tx.commit();
+ }
+ persistenceStore.close();
+ }
+ }
+ catch (Exception e1)
+ {
+ log.warn("Error closing out current request's PersistenceStore:
"+e1.toString(), e1);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
