You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by ju...@apache.org on 2009/01/14 13:44:29 UTC
svn commit: r734370 - in /jackrabbit/branches/1.4/jackrabbit-core: ./
src/main/java/org/apache/jackrabbit/core/RepositoryImpl.java
src/main/java/org/apache/jackrabbit/core/query/
Author: jukka
Date: Wed Jan 14 04:44:22 2009
New Revision: 734370
URL: http://svn.apache.org/viewvc?rev=734370&view=rev
Log:
1.4: Merged revision 733080 (JCR-1823)
Modified:
jackrabbit/branches/1.4/jackrabbit-core/ (props changed)
jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/RepositoryImpl.java
jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/ (props changed)
Propchange: jackrabbit/branches/1.4/jackrabbit-core/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 14 04:44:22 2009
@@ -1 +1 @@
-/jackrabbit/trunk/jackrabbit-core:653417,654078,654514,655917,656240,656655,656664,658583,668086,668147,672125,678788,679389,680135,681031,681287,682409,686688,691181,691550,694164,698200,698209
+/jackrabbit/trunk/jackrabbit-core:653417,654078,654514,655917,656240,656655,656664,658583,668086,668147,672125,678788,679389,680135,681031,681287,682409,686688,691181,691550,694164,698200,698209,733080
Modified: jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/RepositoryImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/RepositoryImpl.java?rev=734370&r1=734369&r2=734370&view=diff
==============================================================================
--- jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/RepositoryImpl.java (original)
+++ jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/RepositoryImpl.java Wed Jan 14 04:44:22 2009
@@ -560,14 +560,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.");
}
}
@@ -664,30 +664,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;
}
@@ -710,12 +698,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();
@@ -795,7 +782,7 @@
}
ObservationDispatcher getObservationDispatcher(String workspaceName)
- throws NoSuchWorkspaceException {
+ throws NoSuchWorkspaceException, RepositoryException {
// check sanity of this instance
sanityCheck();
Propchange: jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 14 04:44:22 2009
@@ -1,2 +1,2 @@
-/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query:653417,654078,654514,655917,656240,656655,656664,658583,668086,668147,672125,678788,679389,680135,681031,681287,682409,686688,691181,691550,694164,698200,698209
+/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query:653417,654078,654514,655917,656240,656655,656664,658583,668086,668147,672125,678788,679389,680135,681031,681287,682409,686688,691181,691550,694164,698200,698209,733080
/jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query:668086