fix for bug where subflow attempted to close already closed hibernate session

git-svn-id: https://svn.codehaus.org/grails/trunk@6710 1cfb16fd-6d17-0410-8ff1-b7e8e1e2867d

Author: graeme

src/web/org/codehaus/groovy/grails/webflow/persistence/SessionAwareHibernateFlowExecutionListener.java

@@ -69,30 +69,32 @@ public void sessionCreated(RequestContext context, FlowSession session) {
     public void sessionEnded(RequestContext context, FlowSession session, AttributeMap output) {
 		if (isPersistenceContext(session.getDefinition())) {
 			final Session hibernateSession = (Session) session.getScope().remove(HIBERNATE_SESSION_ATTRIBUTE);
-			Boolean commitStatus = session.getState().getAttributes().getBoolean("commit");
-			if (Boolean.TRUE.equals(commitStatus)) {
-                try {
-                    if(TransactionSynchronizationManager.hasResource(localSessionFactory)) {
-                        SessionHolder sessionHolder = (SessionHolder) TransactionSynchronizationManager.getResource(localSessionFactory);
-                        sessionHolder.addSession(hibernateSession);
-                    }
-                    localTransactionTemplate.execute(new TransactionCallbackWithoutResult() {
-                        protected void doInTransactionWithoutResult(TransactionStatus status) {
-                            localSessionFactory.getCurrentSession();
-                            // nothing to do; a flush will happen on commit automatically as this is a read-write
-                            // transaction
+            if(hibernateSession.isOpen()) {
+                Boolean commitStatus = session.getState().getAttributes().getBoolean("commit");
+                if (Boolean.TRUE.equals(commitStatus)) {
+                    try {
+                        if(TransactionSynchronizationManager.hasResource(localSessionFactory)) {
+                            SessionHolder sessionHolder = (SessionHolder) TransactionSynchronizationManager.getResource(localSessionFactory);
+                            sessionHolder.addSession(hibernateSession);
+                        }
+                        localTransactionTemplate.execute(new TransactionCallbackWithoutResult() {
+                            protected void doInTransactionWithoutResult(TransactionStatus status) {
+                                localSessionFactory.getCurrentSession();
+                                // nothing to do; a flush will happen on commit automatically as this is a read-write
+                                // transaction
+                            }
+                        });
+                    } finally {
+                        if(TransactionSynchronizationManager.hasResource(localSessionFactory)) {
+                            SessionHolder sessionHolder = (SessionHolder) TransactionSynchronizationManager.getResource(localSessionFactory);
+                            sessionHolder.removeSession(hibernateSession);
                         }
-                    });
-                } finally {
-                    if(TransactionSynchronizationManager.hasResource(localSessionFactory)) {
-                        SessionHolder sessionHolder = (SessionHolder) TransactionSynchronizationManager.getResource(localSessionFactory);
-                        sessionHolder.removeSession(hibernateSession);
-                    }
 
+                    }
                 }
+                unbind(hibernateSession);
+                hibernateSession.close();
             }
-			unbind(hibernateSession);
-			hibernateSession.close();
 		}
     }