Return-Path: X-Original-To: apmail-jackrabbit-oak-commits-archive@minotaur.apache.org Delivered-To: apmail-jackrabbit-oak-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 90F0010AD2 for ; Wed, 5 Jun 2013 08:57:08 +0000 (UTC) Received: (qmail 37067 invoked by uid 500); 5 Jun 2013 08:57:07 -0000 Delivered-To: apmail-jackrabbit-oak-commits-archive@jackrabbit.apache.org Received: (qmail 37059 invoked by uid 500); 5 Jun 2013 08:57:06 -0000 Mailing-List: contact oak-commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: oak-dev@jackrabbit.apache.org Delivered-To: mailing list oak-commits@jackrabbit.apache.org Received: (qmail 37048 invoked by uid 99); 5 Jun 2013 08:57:05 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 05 Jun 2013 08:57:05 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 05 Jun 2013 08:57:03 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 50DE2238889B; Wed, 5 Jun 2013 08:56:44 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1489747 - /jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/SessionContext.java Date: Wed, 05 Jun 2013 08:56:44 -0000 To: oak-commits@jackrabbit.apache.org From: mduerig@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130605085644.50DE2238889B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mduerig Date: Wed Jun 5 08:56:43 2013 New Revision: 1489747 URL: http://svn.apache.org/r1489747 Log: OAK-775 Implement backward compatible observation guard cast Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/SessionContext.java Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/SessionContext.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/SessionContext.java?rev=1489747&r1=1489746&r2=1489747&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/SessionContext.java (original) +++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/SessionContext.java Wed Jun 5 08:56:43 2013 @@ -28,6 +28,7 @@ import javax.jcr.PathNotFoundException; import javax.jcr.Repository; import javax.jcr.RepositoryException; import javax.jcr.Session; +import javax.jcr.UnsupportedRepositoryOperationException; import javax.jcr.ValueFactory; import javax.jcr.Workspace; import javax.jcr.lock.LockManager; @@ -242,10 +243,15 @@ public abstract class SessionContext imp @Nonnull - public ObservationManager getObservationManager() { + public ObservationManager getObservationManager() throws UnsupportedRepositoryOperationException { if (observationManager == null) { ContentRepository contentRepository = repository.getContentRepository(); + if (!(contentRepository instanceof ContentRepositoryImpl)) { + throw new UnsupportedRepositoryOperationException("Observation not supported"); + } + observationManager = new ObservationManagerImpl( + // FIXME avoid casting to implementation ((ContentRepositoryImpl) contentRepository), ReadOnlyNodeTypeManager.getInstance(delegate.getRoot(), namePathMapper), namePathMapper, repository.getObservationExecutor());