jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ang...@apache.org
Subject svn commit: r833186 - in /jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi: lock/LockManagerImpl.java xml/ImportHandler.java xml/SessionImporter.java
Date Thu, 05 Nov 2009 21:32:00 GMT
Author: angela
Date: Thu Nov  5 21:31:59 2009
New Revision: 833186

URL: http://svn.apache.org/viewvc?rev=833186&view=rev
Log:
fix typos in comments and javadoc, improve readability of comments, outdated comment in lockmgr

Modified:
    jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/lock/LockManagerImpl.java
    jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/ImportHandler.java
    jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/SessionImporter.java

Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/lock/LockManagerImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/lock/LockManagerImpl.java?rev=833186&r1=833185&r2=833186&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/lock/LockManagerImpl.java
(original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/lock/LockManagerImpl.java
Thu Nov  5 21:31:59 2009
@@ -102,8 +102,6 @@
     public Lock lock(NodeState nodeState, boolean isDeep, boolean isSessionScoped, long timeoutHint,
String ownerHint) throws RepositoryException {
         // retrieve node first
         Node lhNode;
-        // NOTE: Node must be retrieved from the given NodeState and not from
-        // the overlayed workspace nodestate.
         Item item = itemManager.getItem(nodeState.getHierarchyEntry());
         if (item.isNode()) {
             lhNode = (Node) item;
@@ -309,7 +307,7 @@
             return entry.getNodeState();
         } catch (RepositoryException e) {
             // may occur if the nodeState is not accessible or some generic
-            // error occured.
+            // error occurred.
             // for this case, assume that no lock exists and delegate final
             // validation to the spi-implementation.
             log.warn("Error while accessing lock holding NodeState", e.getMessage());
@@ -381,7 +379,7 @@
                 // assume no lock is present (might not be correct due to incomplete hierarchy)
                 return null;
             } else {
-                // check lockMap again with the lockholding state
+                // check lockMap again with the lock-holding state
                 l = getLockFromMap(nState);
                 if (l != null) {
                     return l;
@@ -668,7 +666,7 @@
             this.node = lockHoldingNode;
 
             // if observation is supported OR if this is a session-scoped lock
-            // holded by this session -> store lock in the map
+            // hold by this session -> store lock in the map
             if (cacheBehaviour == CacheBehaviour.OBSERVATION) {
                 lockMap.put(lockState.lockHoldingState, this);
                 lockState.startListening();
@@ -676,7 +674,7 @@
                 lockMap.put(lockState.lockHoldingState, this);
                 lockState.startListening();
                 // open-scoped locks: the map entry and the lock information
-                // stored therein may become outdated if the token is transfered
+                // stored therein may become outdated if the token is transferred
                 // to another session -> info must be reloaded.
                 if (!isSessionScoped()) {
                     reloadInfo = true;
@@ -795,7 +793,7 @@
          */
         public void lockTokenAdded(String lockToken) throws RepositoryException {
             if (!isSessionScoped() && !isLockOwningSession()) {
-                // unless this lock is session-scoped (token is never transfered)
+                // unless this lock is session-scoped (token is never transferred)
                 // and the session isn't the owner yet (token already present),
                 // it could be that this affects this lock and session became
                 // lock holder -> reload info to assert.

Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/ImportHandler.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/ImportHandler.java?rev=833186&r1=833185&r2=833186&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/ImportHandler.java
(original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/ImportHandler.java
Thu Nov  5 21:31:59 2009
@@ -219,7 +219,7 @@
                              Attributes atts) throws SAXException {
         // check if new context needs to be started
         if (!nsContextStarted) {
-            // there hasn't been a preceeding startPrefixMapping event
+            // there hasn't been a proceeding startPrefixMapping event
             // so enter new namespace context
             nsContext.pushContext();
         } else {

Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/SessionImporter.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/SessionImporter.java?rev=833186&r1=833185&r2=833186&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/SessionImporter.java
(original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/SessionImporter.java
Thu Nov  5 21:31:59 2009
@@ -256,7 +256,7 @@
 
         try {
             checkSession();
-            // adjust references refering to remapped uuids
+            // adjust references referring to remapped uuids
             stateMgr.adjustReferences(refTracker);
         } finally {
             // close this importer since we are done.
@@ -493,7 +493,7 @@
                     throw new ItemExistsException(LogUtil.safeGetJCRPath(existing, session.getPathResolver()));
                 }
             } catch (ItemNotFoundException e) {
-                // property apperently doesn't exist any more
+                // property doesn't exist any more
                 // -> ignore
             }
         }
@@ -593,7 +593,7 @@
                         iv = session.getQValueFactory().create(baos.toByteArray());
                     } else {
                         // >= 65kb: deserialize BINARY type
-                        // using Reader and temporay file
+                        // using Reader and temporary file
                         TransientFileFactory fileFactory = TransientFileFactory.getInstance();
                         File tmpFile = fileFactory.createTransientFile("bin", null, null);
                         FileOutputStream out = new FileOutputStream(tmpFile);



Mime
View raw message