svn commit: r1049916 - in /jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/lock: LockManager.java XAEnvironment.java

[an...@apache.org]

Author: angela
Date: Thu Dec 16 11:00:13 2010
New Revision: 1049916

URL: http://svn.apache.org/viewvc?rev=1049916&view=rev
Log:
minor improvement

Modified:
    jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/lock/LockManager.java
    jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/lock/XAEnvironment.java

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/lock/LockManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/lock/LockManager.java?rev=1049916&r1=1049915&r2=1049916&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/lock/LockManager.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/lock/LockManager.java Thu Dec 16 11:00:13 2010
@@ -51,7 +51,7 @@ public interface LockManager {
      * @param node Node to create the lock for.
      * @param isDeep whether the lock applies to this node only
      * @param isSessionScoped whether the lock is session scoped
-     * @param timoutHint Desired lock timeout in seconds.
+     * @param timeoutHint Desired lock timeout in seconds.
      * @param ownerInfo Optional string acting as information about the owner.
      * @return the lock.
      * @throws LockException if this node already is locked, or some descendant
@@ -59,7 +59,7 @@ public interface LockManager {
      * @see javax.jcr.lock.LockManager#lock(String, boolean, boolean, long, String)
      * @throws RepositoryException
      */
-    Lock lock(NodeImpl node, boolean isDeep, boolean isSessionScoped, long timoutHint, String ownerInfo)
+    Lock lock(NodeImpl node, boolean isDeep, boolean isSessionScoped, long timeoutHint, String ownerInfo)
             throws LockException, RepositoryException;
 
     /**

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/lock/XAEnvironment.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/lock/XAEnvironment.java?rev=1049916&r1=1049915&r2=1049916&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/lock/XAEnvironment.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/lock/XAEnvironment.java Thu Dec 16 11:00:13 2010
@@ -247,7 +247,7 @@ class XAEnvironment {
             throws RepositoryException {
         ArrayList<LockInfo> result = new ArrayList<LockInfo>();
 
-        // get lock informations from global lock manager first
+        // get lock information from global lock manager first
         for (LockInfo info : lockMgr.getLockInfos(session)) {
             // check negative set
             if (!unlockedNodesMap.containsKey(info.getId())) {
@@ -255,10 +255,10 @@ class XAEnvironment {
             }
         }
 
-        // add 'uncommitted' lock informations
+        // add 'uncommitted' lock information
         result.addAll(lockedNodesMap.values());
 
-        return (LockInfo[]) result.toArray(new LockInfo[result.size()]);
+        return result.toArray(new LockInfo[result.size()]);
     }
 
     /**
@@ -520,6 +520,7 @@ class XAEnvironment {
          * As long as the XA environment is neither committed nor rolled back,
          * associated lock information is subject to change.
          */
+        @Override
         public boolean mayChange() {
             if (status != STATUS_COMMITTED
                     && status != STATUS_ROLLED_BACK) {