jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r478634 - in /jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/version: AbstractVersionManager.java InternalVersionImpl.java VersionManagerImpl.java XAVersionManager.java
Date Thu, 23 Nov 2006 18:39:36 GMT
Author: jukka
Date: Thu Nov 23 10:39:35 2006
New Revision: 478634

URL: http://svn.apache.org/viewvc?view=rev&rev=478634
Log:
JCR-546: s/aquire/acquire/

Modified:
    jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/version/AbstractVersionManager.java
    jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/version/InternalVersionImpl.java
    jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/version/VersionManagerImpl.java
    jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/version/XAVersionManager.java

Modified: jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/version/AbstractVersionManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/version/AbstractVersionManager.java?view=diff&rev=478634&r1=478633&r2=478634
==============================================================================
--- jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/version/AbstractVersionManager.java
(original)
+++ jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/version/AbstractVersionManager.java
Thu Nov 23 10:39:35 2006
@@ -118,7 +118,7 @@
     /**
      * aquires the write lock on this version manager.
      */
-    protected void aquireWriteLock() {
+    protected void acquireWriteLock() {
         while (true) {
             try {
                 rwLock.writeLock().acquire();
@@ -139,7 +139,7 @@
     /**
      * aquires the read lock on this version manager.
      */
-    protected void aquireReadLock() {
+    protected void acquireReadLock() {
         while (true) {
             try {
                 rwLock.readLock().acquire();
@@ -162,7 +162,7 @@
      */
     public VersionHistory getVersionHistory(Session session, NodeState node)
             throws RepositoryException {
-        aquireReadLock();
+        acquireReadLock();
         try {
             NodeId vhId = getVersionHistoryId(node);
             if (vhId == null) {
@@ -218,7 +218,7 @@
     InternalVersionHistory createVersionHistory(NodeState node)
             throws RepositoryException {
 
-        aquireWriteLock();
+        acquireWriteLock();
         try {
             stateMgr.edit();
         } catch (IllegalStateException e) {
@@ -307,7 +307,7 @@
     protected InternalVersion checkin(InternalVersionHistoryImpl history, NodeImpl node)
             throws RepositoryException {
 
-        aquireReadLock();
+        acquireReadLock();
         String versionName;
         try {
             // 1. search a predecessor, suitable for generating the new name
@@ -344,7 +344,7 @@
         boolean succeeded = false;
 
         try {
-            aquireWriteLock();
+            acquireWriteLock();
             releaseReadLock();
 
             InternalVersionImpl v = history.checkin(new QName("", versionName), node);
@@ -376,7 +376,7 @@
     protected void removeVersion(InternalVersionHistoryImpl history, QName name)
             throws VersionException, RepositoryException {
 
-        aquireWriteLock();
+        acquireWriteLock();
         try {
             stateMgr.edit();
         } catch (IllegalStateException e) {
@@ -413,7 +413,7 @@
                                               boolean move)
             throws RepositoryException {
 
-        aquireWriteLock();
+        acquireWriteLock();
         try {
             stateMgr.edit();
         } catch (IllegalStateException e) {

Modified: jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/version/InternalVersionImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/version/InternalVersionImpl.java?view=diff&rev=478634&r1=478633&r2=478634
==============================================================================
--- jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/version/InternalVersionImpl.java
(original)
+++ jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/version/InternalVersionImpl.java
Thu Nov 23 10:39:35 2006
@@ -130,7 +130,7 @@
      */
     public InternalVersion[] getSuccessors() {
         try {
-            vMgr.aquireReadLock();
+            vMgr.acquireReadLock();
             InternalValue[] values = node.getPropertyValues(QName.JCR_SUCCESSORS);
             if (values != null) {
                 InternalVersion[] versions = new InternalVersion[values.length];

Modified: jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/version/VersionManagerImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/version/VersionManagerImpl.java?view=diff&rev=478634&r1=478633&r2=478634
==============================================================================
--- jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/version/VersionManagerImpl.java
(original)
+++ jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/version/VersionManagerImpl.java
Thu Nov 23 10:39:35 2006
@@ -222,7 +222,7 @@
      * {@inheritDoc}
      */
     public boolean hasItem(NodeId id) {
-        aquireReadLock();
+        acquireReadLock();
         try {
             return stateMgr.hasItemState(id);
         } finally {
@@ -240,7 +240,7 @@
             return null;
         }
         try {
-            aquireReadLock();
+            acquireReadLock();
             synchronized (versionItems) {
                 InternalVersionItem item = (InternalVersionItem) versionItems.get(id);
                 if (item == null) {
@@ -356,7 +356,7 @@
      * @param items items updated
      */
     public void itemsUpdated(Collection items) {
-        aquireReadLock();
+        acquireReadLock();
         try {
             synchronized (versionItems) {
                 Iterator iter = items.iterator();
@@ -396,7 +396,7 @@
      */
     protected void itemDiscarded(InternalVersionItem item) {
         // evict removed item from cache
-        aquireReadLock();
+        acquireReadLock();
         versionItems.remove(item.getId());
         releaseReadLock();
     }
@@ -407,7 +407,7 @@
      * @return <code>true</code> if the references could be set.
      */
     public boolean setNodeReferences(NodeReferences references) {
-        aquireWriteLock();
+        acquireWriteLock();
         try {
             // filter out version storage intern ones
             NodeReferences refs = new NodeReferences(references.getId());
@@ -435,7 +435,7 @@
      * {@inheritDoc}
      */
     protected List getItemReferences(InternalVersionItem item) {
-        aquireReadLock();
+        acquireReadLock();
         try {
             NodeReferences refs = pMgr.load(new NodeReferencesId(item.getId()));
             return refs.getReferences();
@@ -484,7 +484,7 @@
      */
     public void stateDestroyed(ItemState destroyed) {
         // evict removed item from cache
-        aquireReadLock();
+        acquireReadLock();
         versionItems.remove(destroyed.getId());
         releaseReadLock();
     }

Modified: jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/version/XAVersionManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/version/XAVersionManager.java?view=diff&rev=478634&r1=478633&r2=478634
==============================================================================
--- jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/version/XAVersionManager.java
(original)
+++ jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/version/XAVersionManager.java
Thu Nov 23 10:39:35 2006
@@ -462,7 +462,7 @@
      * Delegate the call to our XA item state manager.
      */
     public void prepare(TransactionContext tx) throws TransactionException {
-        vMgr.aquireWriteLock();
+        vMgr.acquireWriteLock();
         vMgr.getSharedStateMgr().setNoLockHack(true);
         vmgrLocked = true;
         ((XAItemStateManager) stateMgr).prepare(tx);
@@ -526,7 +526,7 @@
             throws RepositoryException {
 
         NodeState state;
-        aquireReadLock();
+        acquireReadLock();
         try {
             state = (NodeState) stateMgr.getItemState(history.getId());
         } catch (ItemStateException e) {



Mime
View raw message