Author: cziegeler Date: Tue Mar 9 07:42:51 2010 New Revision: 920721 URL: http://svn.apache.org/viewvc?rev=920721&view=rev Log: SLING-1270 : Use new close method to close the session.
Modified: sling/trunk/bundles/engine/pom.xml sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/SlingMainServlet.java Modified: sling/trunk/bundles/engine/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/engine/pom.xml?rev=920721&r1=920720&r2=920721&view=diff ============================================================================== --- sling/trunk/bundles/engine/pom.xml (original) +++ sling/trunk/bundles/engine/pom.xml Tue Mar 9 07:42:51 2010 @@ -95,16 +95,10 @@ </plugins> </reporting> <dependencies> - <!-- Temporary dependency for SLING-1270--> - <dependency> - <groupId>javax.jcr</groupId> - <artifactId>jcr</artifactId> - </dependency> - <!-- END Temporary dependency for SLING-1270--> <dependency> <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.api</artifactId> - <version>2.0.8</version> + <version>2.0.9-SNAPSHOT</version> <scope>provided</scope> </dependency> <dependency> Modified: sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/SlingMainServlet.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/SlingMainServlet.java?rev=920721&r1=920720&r2=920721&view=diff ============================================================================== --- sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/SlingMainServlet.java (original) +++ sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/SlingMainServlet.java Tue Mar 9 07:42:51 2010 @@ -33,7 +33,6 @@ import java.util.Hashtable; import java.util.List; import java.util.Map; -import javax.jcr.Session; import javax.servlet.Filter; import javax.servlet.FilterChain; import javax.servlet.FilterConfig; @@ -370,14 +369,7 @@ public class SlingMainServlet extends Ge // FIXME: This must be removed // SLING-1270 Temporary solution to ensure session is logged out if (resolver != null) { - Session session = resolver.adaptTo(Session.class); - if (session != null && session.isLive()) { - try { - session.logout(); - } catch (Throwable t) { - // ignore - } - } + resolver.close(); } // END SLING-1270 Temporary solution to ensure session is logged out }