You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-dev@jackrabbit.apache.org by an...@apache.org on 2012/03/16 12:19:11 UTC
svn commit: r1301437 - in
/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr:
NodeImpl.java SessionImpl.java
Author: angela
Date: Fri Mar 16 11:19:11 2012
New Revision: 1301437
URL: http://svn.apache.org/viewvc?rev=1301437&view=rev
Log:
OAK-15 : Clean up oak-jcr (fix javadoc)
Modified:
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/NodeImpl.java
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/SessionImpl.java
Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/NodeImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/NodeImpl.java?rev=1301437&r1=1301436&r2=1301437&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/NodeImpl.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/NodeImpl.java Fri Mar 16 11:19:11 2012
@@ -809,7 +809,7 @@ public class NodeImpl extends ItemImpl i
}
/**
- * @see javax.jcr.Node#getAllowedLifecycleTransistions() ()
+ * @see javax.jcr.Node#getAllowedLifecycleTransistions()
*/
@Override
public String[] getAllowedLifecycleTransistions() throws RepositoryException {
@@ -823,7 +823,7 @@ public class NodeImpl extends ItemImpl i
* with the editing session.
*
* @return the version manager associated with the editing session.
- * @throws RepositoryException
+ * @throws RepositoryException If an error occurs while retrieving the version manager.
*/
private VersionManager getVersionManager() throws RepositoryException {
return getSession().getWorkspace().getVersionManager();
Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/SessionImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/SessionImpl.java?rev=1301437&r1=1301436&r2=1301437&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/SessionImpl.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/SessionImpl.java Fri Mar 16 11:19:11 2012
@@ -307,7 +307,7 @@ public class SessionImpl extends Abstrac
try {
getWorkspace().getLockManager().addLockToken(lt);
} catch (RepositoryException e) {
- log.warn("Unable to add lock token '" +lt+ "' to this session.", e);
+ log.warn("Unable to add lock token '{}' to this session: {}", lt, e.getMessage());
}
}
@@ -319,7 +319,7 @@ public class SessionImpl extends Abstrac
try {
return getWorkspace().getLockManager().getLockTokens();
} catch (RepositoryException e) {
- log.warn("Unable to retrieve lock tokens for this session. (" + e.getMessage() + ")");
+ log.warn("Unable to retrieve lock tokens for this session: {}", e.getMessage());
return new String[0]; }
}
@@ -331,7 +331,7 @@ public class SessionImpl extends Abstrac
try {
getWorkspace().getLockManager().addLockToken(lt);
} catch (RepositoryException e) {
- log.warn("Unable to add lock token '" +lt+ "' to this session.", e);
+ log.warn("Unable to add lock token '{}' to this session: {}", lt, e.getMessage());
}
}
@@ -434,8 +434,9 @@ public class SessionImpl extends Abstrac
* <li>{@link Repository#OPTION_XML_IMPORT_SUPPORTED}</li>
* <li>{@link Repository#WRITE_SUPPORTED}</li>
* </ul>
- * @throws UnsupportedRepositoryOperationException
- * @throws RepositoryException
+ * @throws UnsupportedRepositoryOperationException If the given option is
+ * not supported.
+ * @throws RepositoryException If another error occurs.
* @see javax.jcr.Repository#getDescriptorKeys()
*/
void checkSupportedOption(String option) throws RepositoryException {