jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r734080 - in /jackrabbit/branches/1.5: ./ jackrabbit-core/src/main/java/org/apache/jackrabbit/core/RepositoryImpl.java
Date Tue, 13 Jan 2009 09:26:44 GMT
Author: jukka
Date: Tue Jan 13 01:26:39 2009
New Revision: 734080

URL: http://svn.apache.org/viewvc?rev=734080&view=rev
Log:
1.5: Merged revision 733080 (JCR-1823). Ignored other revisions.

Modified:
    jackrabbit/branches/1.5/   (props changed)
    jackrabbit/branches/1.5/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/RepositoryImpl.java

Propchange: jackrabbit/branches/1.5/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 13 01:26:39 2009
@@ -1,2 +1,2 @@
 /jackrabbit/branches/1.3:631261
-/jackrabbit/trunk:703899-704158,704165,704167,704324,704358,704361,704864,704933,704939,705010,705033,705243,705496,705522,705579,705925,705932,705934,705937-705938,705961,706242,706273,706285-706286,706562,706606,706649,706655,706660,706697,706918,707303-707304,707307,707310,707630,708206,708598,708609,708613,708619,708634,708840,708863,708909,708929,708943,709115,709142,709207,709211,710047,711238,711566-711567,711595,711841-711843,712984-712985,713037,713059,713065,713072,713076,713162,713214,713956,713958,713964,713971,713975,714034,718218,718249-718250,718371,718376,718566,718632,718981,719225,719282,719575-719577,719579,719585-719586,719588,719592,720455,720484,720492,720524,720533,720540,720673,720679,720687,720784,720940,720969,721186,721191,721194,721235,721387-721389,721470,721495,722068-722069,722463,722465,722467,722470,722825,723281,723346,723728,723784,724300,724387,725292,727376,727388,727390,727395,727397,727402,727492,727701,728022,731896,731934,731941,73234
 7,732678,732686,732689,732693,732703,732715-732716,732719,732728,732730,732734-732738,732740,732742-732743,732745
+/jackrabbit/trunk:703899-704158,704165,704167,704324,704358,704361,704864,704933,704939,705010,705033,705243,705496,705522,705579,705925,705932,705934,705937-705938,705961,706242,706273,706285-706286,706562,706606,706649,706655,706660,706697,706918,707303-707304,707307,707310,707630,708206,708598,708609,708613,708619,708634,708840,708863,708909,708929,708943,709115,709142,709207,709211,710047,711238,711566-711567,711595,711841-711843,712984-712985,713037,713059,713065,713072,713076,713162,713214,713956,713958,713964,713971,713975,714034,718218,718249-718250,718371,718376,718566,718632,718981,719225,719282,719575-719577,719579,719585-719586,719588,719592,720455,720484,720492,720524,720533,720540,720673,720679,720687,720784,720940,720969,721186,721191,721194,721235,721387-721389,721470,721495,722068-722069,722463,722465,722467,722470,722825,723281,723346,723728,723784,724300,724387,725292,727376,727388,727390,727395,727397,727402,727492,727701,728022,731896,731934,731941,73234
 7,732678,732686,732689,732693,732703,732715-732716,732719,732728,732730,732734-732738,732740,732742-732743,732745,732867,732883,733057-733059,733061,733080

Modified: jackrabbit/branches/1.5/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/RepositoryImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.5/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/RepositoryImpl.java?rev=734080&r1=734079&r2=734080&view=diff
==============================================================================
--- jackrabbit/branches/1.5/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/RepositoryImpl.java
(original)
+++ jackrabbit/branches/1.5/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/RepositoryImpl.java
Tue Jan 13 01:26:39 2009
@@ -621,14 +621,14 @@
     /**
      * Performs a sanity check on this repository instance.
      *
-     * @throws IllegalStateException if this repository has been rendered
-     *                               invalid for some reason (e.g. if it has
-     *                               been shut down)
+     * @throws RepositoryException if this repository has been rendered
+     *             invalid for some reason (e.g. if it has been shut down)
      */
-    protected void sanityCheck() throws IllegalStateException {
+    protected void sanityCheck() throws RepositoryException {
         // check repository status
         if (disposed) {
-            throw new IllegalStateException("repository instance has been shut down");
+            throw new RepositoryException(
+                    "This repository instance has been shut down.");
         }
     }
 
@@ -713,30 +713,18 @@
     }
 
     protected NamespaceRegistryImpl getNamespaceRegistry() {
-        // check sanity of this instance
-        sanityCheck();
-
         return nsReg;
     }
 
     protected NodeTypeRegistry getNodeTypeRegistry() {
-        // check sanity of this instance
-        sanityCheck();
-
         return ntReg;
     }
 
     protected VersionManager getVersionManager() {
-        // check sanity of this instance
-        sanityCheck();
-
         return vMgr;
     }
 
     protected NodeId getRootNodeId() {
-        // check sanity of this instance
-        sanityCheck();
-
         return rootNodeId;
     }
 
@@ -759,12 +747,11 @@
      *                      is to be returned. This must not be <code>null</code>.
      * @return The {@link WorkspaceInfo} for the named workspace. This will
      *         never be <code>null</code>.
-     * @throws IllegalStateException    If this repository has already been
-     *                                  shut down.
      * @throws NoSuchWorkspaceException If the named workspace does not exist.
+     * @throws RepositoryException If this repository has been shut down.
      */
     protected WorkspaceInfo getWorkspaceInfo(String workspaceName)
-            throws IllegalStateException, NoSuchWorkspaceException {
+            throws NoSuchWorkspaceException, RepositoryException {
         // check sanity of this instance
         sanityCheck();
 
@@ -907,7 +894,7 @@
     }
 
     ObservationDispatcher getObservationDispatcher(String workspaceName)
-            throws NoSuchWorkspaceException {
+            throws NoSuchWorkspaceException, RepositoryException {
         // check sanity of this instance
         sanityCheck();
 



Mime
View raw message